From 5b2cae6703d8a55e047ef2d830dbe80c392feac7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 11 Oct 2017 14:07:53 -0500 Subject: [PATCH] range: Bring back middle clicks It does not hurt us to keep middle clicks doing the same as shift-primary clicks. This makes the transition from gtk2 less painful in terms of muscle memory. https://bugzilla.gnome.org/show_bug.cgi?id=787669 --- gtk/gtkrange.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 98ec13bc3a..eee45bee21 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2741,9 +2741,9 @@ gtk_range_multipress_gesture_pressed (GtkGestureMultiPress *gesture, } else if (priv->mouse_location == priv->trough_gadget && (source == GDK_SOURCE_TOUCHSCREEN || - (button == GDK_BUTTON_PRIMARY && - ((primary_warps && !shift_pressed) || - (!primary_warps && shift_pressed))))) + (primary_warps && !shift_pressed && button == GDK_BUTTON_PRIMARY) || + (!primary_warps && shift_pressed && button == GDK_BUTTON_PRIMARY) || + (!primary_warps && button == GDK_BUTTON_MIDDLE))) { /* warp to location */ GdkRectangle slider; @@ -2772,9 +2772,9 @@ gtk_range_multipress_gesture_pressed (GtkGestureMultiPress *gesture, update_slider_position (range, x, y); } else if (priv->mouse_location == priv->trough_gadget && - button == GDK_BUTTON_PRIMARY && - ((primary_warps && shift_pressed) || - (!primary_warps && !shift_pressed))) + ((primary_warps && shift_pressed && button == GDK_BUTTON_PRIMARY) || + (!primary_warps && !shift_pressed && button == GDK_BUTTON_PRIMARY) || + (primary_warps && button == GDK_BUTTON_MIDDLE))) { /* jump by pages */ GtkScrollType scroll;