callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-shifted-scrolling-gtk3' into 'gtk-3-24'

Browse Source 
gtkscrolledwindow: Consider shift key presses when decelerating [gtk3]

See merge request GNOME/gtk!287
This commit is contained in:
Matthias Clasen
2018-08-15 22:02:45 +00:00
parent 677627346d 5c6596ad99
commit c9f875bd77
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkscrolledwindow.c
View File

@ -1321,7 +1321,8 @@ get_scroll_unit (GtkScrolledWindow *sw,
static void
scroll_history_push (GtkScrolledWindow *sw,
GdkEventScroll *event)
GdkEventScroll *event,
gboolean shifted)
{
GtkScrolledWindowPrivate *priv = sw->priv;
ScrollHistoryElem new_item;
@ -1343,8 +1344,16 @@ scroll_history_push (GtkScrolledWindow *sw,
if (i > 0)
g_array_remove_range (priv->scroll_history, 0, i);
new_item.dx = event->delta_x;
new_item.dy = event->delta_y;
if (shifted)
{
new_item.dx = event->delta_y;
new_item.dy = event->delta_x;
}
else
{
new_item.dx = event->delta_x;
new_item.dy = event->delta_y;
}
new_item.evtime = event->time;
g_array_append_val (priv->scroll_history, new_item);
}
@ -3481,7 +3490,7 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
scroll_history_reset (scrolled_window);
}
scroll_history_push (scrolled_window, event);
scroll_history_push (scrolled_window, event, shifted);
if (input_source == GDK_SOURCE_TRACKPOINT ||
input_source == GDK_SOURCE_TOUCHPAD)