aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2012-08-27 22:01:07 +0200
committerLars Uebernickel <lars.uebernickel@canonical.com>2012-08-27 22:01:07 +0200
commitbfdc8422316c9005045041a22ded09e568240ec2 (patch)
treee4e36621c17e881f74f5656bb33b9969bd498853 /src
parent2481b74fa64122365eef5293ae86d71b5fae3fa6 (diff)
parent0d4d88db5127bbda61346429ab6ae32df5640fb0 (diff)
downloadayatana-ido-bfdc8422316c9005045041a22ded09e568240ec2.tar.gz
ayatana-ido-bfdc8422316c9005045041a22ded09e568240ec2.tar.bz2
ayatana-ido-bfdc8422316c9005045041a22ded09e568240ec2.zip
Merge lp:~larsu/ido/remove-slider-hack-953757
Removes slider hacks.
Diffstat (limited to 'src')
-rw-r--r--src/idorange.c2
-rw-r--r--src/idoscalemenuitem.c20
2 files changed, 2 insertions, 20 deletions
diff --git a/src/idorange.c b/src/idorange.c
index 4f165bb..3e88fd9 100644
--- a/src/idorange.c
+++ b/src/idorange.c
@@ -156,6 +156,8 @@ ido_range_constructed (GObject *object)
}
gtk_range_set_slider_size_fixed (GTK_RANGE (range), TRUE);
+
+ G_OBJECT_CLASS (ido_range_parent_class)->constructed (object);
}
static void
diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c
index b3c80f6..986d9a7 100644
--- a/src/idoscalemenuitem.c
+++ b/src/idoscalemenuitem.c
@@ -205,21 +205,6 @@ ido_scale_menu_item_toggle_size_allocate (IdoScaleMenuItem *item,
priv->toggle_size = toggle_size;
}
-static gboolean
-on_scale_button_press_or_release_event (GtkWidget * widget G_GNUC_UNUSED,
- GdkEventButton * event,
- gpointer unused G_GNUC_UNUSED)
-{
- /* HACK: we want the behaviour you get with the middle button, so we
- * mangle the event. clicking with other buttons moves the slider in
- * step increments, clicking with the middle button moves the slider to
- * the location of the click. */
- if (event->button == 1)
- event->button = 2;
-
- return FALSE;
-}
-
static void
ido_scale_menu_item_constructed (GObject *object)
{
@@ -238,12 +223,7 @@ ido_scale_menu_item_constructed (GObject *object)
priv->scale = ido_range_new (adj, range_style);
g_object_ref (priv->scale);
gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
- g_signal_connect (G_OBJECT (priv->scale), "button-press-event",
- G_CALLBACK (on_scale_button_press_or_release_event), NULL);
- g_signal_connect (G_OBJECT (priv->scale), "button-release-event",
- G_CALLBACK (on_scale_button_press_or_release_event), NULL);
-
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
priv->primary_image = gtk_image_new ();