AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 20:30:11 +00:00
Code Issues Projects Releases Wiki Activity

Remove timeout when disposing GtkEditableLabel

Browse Source 
Fixes: #5584
This commit is contained in:
Alexandros Theodotou 2023-02-12 09:28:22 +09:00
parent 2285ef3824
commit d918a77d34
No known key found for this signature in database
GPG Key ID: 022EAE42313D70F3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkeditablelabel.c
View File

@ -72,6 +72,8 @@ struct _GtkEditableLabel
GtkWidget *stack; GtkWidget *stack;
GtkWidget *label; GtkWidget *label;
GtkWidget *entry; GtkWidget *entry;
guint stop_editing_soon_id;
}; };
struct _GtkEditableLabelClass struct _GtkEditableLabelClass
@ -196,10 +198,12 @@ static gboolean
stop_editing_soon (gpointer data) stop_editing_soon (gpointer data)
{ {
GtkEventController *controller = data; GtkEventController *controller = data;
GtkWidget *widget = gtk_event_controller_get_widget (controller); GtkEditableLabel *self = GTK_EDITABLE_LABEL (gtk_event_controller_get_widget (controller));
if (!gtk_event_controller_focus_contains_focus (GTK_EVENT_CONTROLLER_FOCUS (controller))) if (!gtk_event_controller_focus_contains_focus (GTK_EVENT_CONTROLLER_FOCUS (controller)))
gtk_editable_label_stop_editing (GTK_EDITABLE_LABEL (widget), TRUE); gtk_editable_label_stop_editing (self, TRUE);
self->stop_editing_soon_id = 0;
return FALSE; return FALSE;
} }
@ -208,7 +212,8 @@ static void
gtk_editable_label_focus_out (GtkEventController *controller, gtk_editable_label_focus_out (GtkEventController *controller,
GtkEditableLabel *self) GtkEditableLabel *self)
{ {
g_timeout_add (100, stop_editing_soon, controller); if (self->stop_editing_soon_id == 0)
self->stop_editing_soon_id = g_timeout_add (100, stop_editing_soon, controller);
} }
static void static void
@ -361,6 +366,8 @@ gtk_editable_label_dispose (GObject *object)
self->entry = NULL; self->entry = NULL;
self->label = NULL; self->label = NULL;
g_clear_handle_id (&self->stop_editing_soon_id, g_source_remove);
G_OBJECT_CLASS (gtk_editable_label_parent_class)->dispose (object); G_OBJECT_CLASS (gtk_editable_label_parent_class)->dispose (object);
} }