From de537a07556664a379ee3b6b7fa4b5bcbeb79ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 6 Mar 2018 20:04:30 +0100 Subject: [PATCH] entry: Fix invisible cursors --- gtk/gtkentry.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index a62f8beb15..d038aeaf6e 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4029,25 +4029,19 @@ gtk_entry_drag_gesture_end (GtkGestureDrag *gesture, gtk_entry_update_primary_selection (entry); } -static void -set_invisible_cursor (GtkWidget *widget) -{ - GdkCursor *cursor; - - cursor = gdk_cursor_new_from_name ("none", NULL); - gtk_widget_set_cursor (widget, cursor); - g_object_unref (cursor); -} - static void gtk_entry_obscure_mouse_cursor (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); + GdkCursor *cursor; if (priv->mouse_cursor_obscured) return; - set_invisible_cursor (GTK_WIDGET (entry)); + cursor = gdk_cursor_new_from_name ("none", NULL); + gtk_widget_set_cursor (GTK_WIDGET (entry), cursor); + g_object_unref (cursor); + priv->mouse_cursor_obscured = TRUE; } @@ -4289,9 +4283,6 @@ gtk_entry_state_flags_changed (GtkWidget *widget, GtkEntry *entry = GTK_ENTRY (widget); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); - if (gtk_widget_get_realized (widget)) - priv->mouse_cursor_obscured = FALSE; - if (!gtk_widget_is_sensitive (widget)) { /* Clear any selection */