diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-09 13:30:36 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-09 13:30:36 +0000 |
| commit | d15b0afca996532130c1602a7d02659731c329df (patch) | |
| tree | 0514942d480a28ff7e70ac7d357bb0c801f4d455 | |
| parent | 0d6bbc035d34830b35f69d75ed992a1b5db21ac7 (diff) | |
| parent | 9313d4b6b4368f5615d3fb65dac63411e22e9fa7 (diff) | |
| download | gtk+-d15b0afca996532130c1602a7d02659731c329df.tar.gz | |
Merge branch 'no-scroll-cursor' into 'master'
scrolledwindow: Stop using scroll cursors
See merge request GNOME/gtk!3416
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 40e285c77b..35ca37ab72 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -401,9 +401,6 @@ static void indicator_start_fade (Indicator *indicator, static void indicator_set_over (Indicator *indicator, gboolean over); -static void install_scroll_cursor (GtkScrolledWindow *scrolled_window); -static void uninstall_scroll_cursor (GtkScrolledWindow *scrolled_window); - static void scrolled_window_scroll (GtkScrolledWindow *scrolled_window, double delta_x, double delta_y, @@ -1335,10 +1332,7 @@ start_scroll_deceleration_cb (gpointer user_data) priv->scroll_events_overshoot_id = 0; if (!priv->deceleration_id) - { - uninstall_scroll_cursor (scrolled_window); - gtk_scrolled_window_start_deceleration (scrolled_window); - } + gtk_scrolled_window_start_deceleration (scrolled_window); return FALSE; } @@ -1349,7 +1343,6 @@ scroll_controller_scroll_begin (GtkEventControllerScroll *scroll, { GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); - install_scroll_cursor (scrolled_window); priv->smooth_scroll = TRUE; } @@ -1442,7 +1435,6 @@ scroll_controller_scroll_end (GtkEventControllerScroll *scroll, GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window); priv->smooth_scroll = FALSE; - uninstall_scroll_cursor (scrolled_window); } static void @@ -3185,18 +3177,6 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window, } static void -install_scroll_cursor (GtkScrolledWindow *scrolled_window) -{ - gtk_widget_set_cursor_from_name (GTK_WIDGET (scrolled_window), "all-scroll"); -} - -static void -uninstall_scroll_cursor (GtkScrolledWindow *scrolled_window) -{ - gtk_widget_set_cursor (GTK_WIDGET (scrolled_window), NULL); -} - -static void _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window, GtkAdjustment *adjustment, double value) |