AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkscrolledwindow: Consider shift key presses when decelerating

Browse Source 
Otherwise horizontal scrolling using the shift key would decelerate
vertically.

Fixes https://gitlab.gnome.org/GNOME/gtk/issues/770
This commit is contained in:
Sebastian Keller 2018-08-04 16:36:47 +02:00
parent 6e4da8fbdb
commit 5c6596ad99
1 changed files with 13 additions and 4 deletions
Show Stats 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 static void
scroll_history_push (GtkScrolledWindow *sw, scroll_history_push (GtkScrolledWindow *sw,
GdkEventScroll *event) GdkEventScroll *event,
gboolean shifted)
{ {
GtkScrolledWindowPrivate *priv = sw->priv; GtkScrolledWindowPrivate *priv = sw->priv;
ScrollHistoryElem new_item; ScrollHistoryElem new_item;
@ -1343,8 +1344,16 @@ scroll_history_push (GtkScrolledWindow *sw,
if (i > 0) if (i > 0)
g_array_remove_range (priv->scroll_history, 0, i); g_array_remove_range (priv->scroll_history, 0, i);
new_item.dx = event->delta_x; if (shifted)
new_item.dy = event->delta_y; {
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; new_item.evtime = event->time;
g_array_append_val (priv->scroll_history, new_item); 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_reset (scrolled_window);
} }
scroll_history_push (scrolled_window, event); scroll_history_push (scrolled_window, event, shifted);
if (input_source == GDK_SOURCE_TRACKPOINT || if (input_source == GDK_SOURCE_TRACKPOINT ||
input_source == GDK_SOURCE_TOUCHPAD) input_source == GDK_SOURCE_TOUCHPAD)