[gtk/gtk-4-2: 22/91] scrolledwindow: Stop using scroll cursors
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-4-2: 22/91] scrolledwindow: Stop using scroll cursors
- Date: Tue, 4 May 2021 02:05:40 +0000 (UTC)
commit 03176fe23cdc5cce3c639794b3d528a575846c78
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Apr 9 08:26:09 2021 -0400
scrolledwindow: Stop using scroll cursors
We used to override cursor to use all-scroll while the
content is being scrolled. Unfortunately, there is several
problems with this:
- It is really only expected certain devices, and we don't
have the device information on Wayland
- With the way cursor setting works in GTK4, non-NULL cursors
of the content (eg the text views ibeam) win, making the
scroll cursor not show up
- Under X11, we seem to miss scroll end events and then
the scroll cursor gets stuck
Therefore, just remove this feature.
gtk/gtkscrolledwindow.c | 22 +---------------------
1 file changed, 1 insertion(+), 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
@@ -3184,18 +3176,6 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window,
*allocation = child_allocation;
}
-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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]