aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCody Russell <crussell@canonical.com>2010-03-09 11:43:40 -0600
committerCody Russell <crussell@canonical.com>2010-03-09 11:43:40 -0600
commitde771b0efbaaf02eb510d999d11e07decc7db454 (patch)
tree86378f6fad9169743ea432681cca0f577daab01c /src
parenta46e53c8bf8ea3e487110976d1fd56bda9bcc7c5 (diff)
downloadayatana-ido-de771b0efbaaf02eb510d999d11e07decc7db454.tar.gz
ayatana-ido-de771b0efbaaf02eb510d999d11e07decc7db454.tar.bz2
ayatana-ido-de771b0efbaaf02eb510d999d11e07decc7db454.zip
Fix for grab/release signals. If you grab the slider and then release it while the mouse is outside the menu, it was not emitting the released signal.
Diffstat (limited to 'src')
-rw-r--r--src/idoscalemenuitem.c62
1 files changed, 58 insertions, 4 deletions
diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c
index ca1e678..7d16ec9 100644
--- a/src/idoscalemenuitem.c
+++ b/src/idoscalemenuitem.c
@@ -55,6 +55,9 @@ static void ido_scale_menu_item_primary_image_notify (GtkImage
static void ido_scale_menu_item_secondary_image_notify (GtkImage *image,
GParamSpec *pspec,
IdoScaleMenuItem *item);
+static void ido_scale_menu_item_notify (IdoScaleMenuItem *item,
+ GParamSpec *pspec,
+ gpointer user_data);
struct _IdoScaleMenuItemPrivate {
GtkWidget *scale;
@@ -67,6 +70,7 @@ struct _IdoScaleMenuItemPrivate {
gdouble left_padding;
gdouble right_padding;
gboolean reverse_scroll;
+ gboolean grabbed;
};
enum {
@@ -329,6 +333,10 @@ ido_scale_menu_item_constructor (GType type,
priv = GET_PRIVATE (object);
+ g_signal_connect (object, "notify",
+ G_CALLBACK (ido_scale_menu_item_notify),
+ NULL);
+
priv->offscreen = gtk_offscreen_window_new ();
gtk_widget_set_name (priv->offscreen, "ido-offscreen-scale");
@@ -413,7 +421,11 @@ ido_scale_menu_item_button_press_event (GtkWidget *menuitem,
gtk_widget_event (scale,
((GdkEvent *)(void*)(event)));
- g_signal_emit (menuitem, signals[SLIDER_GRABBED], 0);
+ if (!priv->grabbed)
+ {
+ priv->grabbed = TRUE;
+ g_signal_emit (menuitem, signals[SLIDER_GRABBED], 0);
+ }
return TRUE;
}
@@ -441,7 +453,11 @@ ido_scale_menu_item_button_release_event (GtkWidget *menuitem,
gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj));
}
- g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ if (priv->grabbed)
+ {
+ priv->grabbed = FALSE;
+ g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ }
return TRUE;
}
@@ -460,7 +476,11 @@ ido_scale_menu_item_button_release_event (GtkWidget *menuitem,
gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
}
- g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ if (priv->grabbed)
+ {
+ priv->grabbed = FALSE;
+ g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ }
return TRUE;
}
@@ -478,7 +498,11 @@ ido_scale_menu_item_button_release_event (GtkWidget *menuitem,
event->window = tmp;
- g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ if (priv->grabbed)
+ {
+ priv->grabbed = FALSE;
+ g_signal_emit (menuitem, signals[SLIDER_RELEASED], 0);
+ }
return TRUE;
}
@@ -504,6 +528,36 @@ ido_scale_menu_item_motion_notify_event (GtkWidget *menuitem,
}
static void
+menu_hidden (GtkWidget *menu,
+ IdoScaleMenuItem *scale)
+{
+ IdoScaleMenuItemPrivate *priv = GET_PRIVATE (scale);
+
+ if (priv->grabbed)
+ {
+ priv->grabbed = FALSE;
+ g_signal_emit (scale, signals[SLIDER_RELEASED], 0);
+ }
+}
+
+static void
+ido_scale_menu_item_notify (IdoScaleMenuItem *item,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ if (g_strcmp0 (pspec->name, "parent"))
+ {
+ GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (item));
+ if (parent)
+ {
+ g_signal_connect (parent, "hide",
+ G_CALLBACK (menu_hidden),
+ item);
+ }
+ }
+}
+
+static void
ido_scale_menu_item_primary_image_notify (GtkImage *image,
GParamSpec *pspec,
IdoScaleMenuItem *item)