Merge lp:~john-ledbetter/notify-osd/bug-fixing into lp:notify-osd/lucid

Proposed by John Ledbetter
Status: Merged
Approved by: Mirco Müller
Approved revision: 429
Merged at revision: 431
Proposed branch: lp:~john-ledbetter/notify-osd/bug-fixing
Merge into: lp:notify-osd/lucid
Diff against target: 57 lines (+29/-0)
2 files modified
src/bubble.c (+26/-0)
src/bubble.h (+3/-0)
To merge this branch: bzr merge lp:~john-ledbetter/notify-osd/bug-fixing
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+39068@code.launchpad.net

Commit message

Fixes LP:#500663 (Notifications will not expire while the mouse is over them)

Description of the change

While the mouse is over a notification bubble, the bubble will not expire. When the mouse leaves the bubble, the bubble will persist for 3000 ms and then expire. (per https://wiki.ubuntu.com/NotifyOSD#Animations%20and%20durations)

This fixes LP:#500663

To post a comment you must log in.
Revision history for this message
jarryson (jarryson) wrote :

when mouse over bubble, the bubble will be transparent, i can not see it clearly, and stopping the timer don't make any difference.

Revision history for this message
Mirco Müller (macslow) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/bubble.c'
--- src/bubble.c 2010-10-05 17:54:42 +0000
+++ src/bubble.c 2010-10-21 17:12:49 +0000
@@ -2691,6 +2691,16 @@
2691 {2691 {
2692 priv->mouse_over = flag;2692 priv->mouse_over = flag;
2693 update_shape (self);2693 update_shape (self);
2694
2695 if (flag) {
2696 g_debug("mouse entered bubble, supressing timeout");
2697 bubble_clear_timer(self);
2698 } else {
2699 g_debug("mouse left bubble, continuing timeout");
2700 bubble_set_timeout(self, 3000);
2701 bubble_start_timer(self, TRUE);
2702 }
2703
2694 }2704 }
26952705
2696}2706}
@@ -3121,6 +3131,22 @@
3121}3131}
31223132
3123void3133void
3134bubble_clear_timer (Bubble* self)
3135{
3136 guint timer_id;
3137
3138 if (!self || !IS_BUBBLE (self))
3139 return;
3140
3141 timer_id = GET_PRIVATE(self)->timer_id;
3142
3143 if (timer_id > 0) {
3144 g_source_remove (timer_id);
3145 bubble_set_timer_id(self, 0);
3146 }
3147}
3148
3149void
3124bubble_get_position (Bubble* self,3150bubble_get_position (Bubble* self,
3125 gint* x,3151 gint* x,
3126 gint* y)3152 gint* y)
31273153
=== modified file 'src/bubble.h'
--- src/bubble.h 2009-10-20 08:51:11 +0000
+++ src/bubble.h 2010-10-21 17:12:49 +0000
@@ -193,6 +193,9 @@
193 gboolean trigger);193 gboolean trigger);
194194
195void195void
196bubble_clear_timer (Bubble* self);
197
198void
196bubble_get_position (Bubble* self,199bubble_get_position (Bubble* self,
197 gint* x,200 gint* x,
198 gint* y);201 gint* y);

Subscribers

People subscribed via source and target branches

to all changes: