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

ComboBox: Don’t pile up ::grab-broken handlers

Browse Source 
It was connecting a new handler to do the same thing every time it
popped up, never disconnecting between. Just connect once in init().
This commit is contained in:
Daniel Boles 2017-10-04 21:45:50 +01:00
parent 6c5b284615
commit a8df958c07
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkcombobox.c
View File

@ -1801,6 +1801,19 @@ gtk_combo_box_detacher (GtkWidget *widget,
priv->popup_widget = NULL;
}
static gboolean
gtk_combo_box_grab_broken_event (GtkWidget *widget,
GdkEventGrabBroken *event,
gpointer user_data)
{
GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
if (event->grab_window == NULL)
gtk_combo_box_popdown (combo_box);
return TRUE;
}
static void
gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
GtkWidget *popup)
@ -1861,6 +1874,9 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
g_signal_connect (priv->popup_window, "hide",
G_CALLBACK (gtk_combo_box_child_hide),
combo_box);
g_signal_connect (priv->popup_window, "grab-broken-event",
G_CALLBACK (gtk_combo_box_grab_broken_event),
combo_box);
gtk_window_set_resizable (GTK_WINDOW (priv->popup_window), FALSE);
@ -2229,19 +2245,6 @@ popup_grab_on_window (GdkWindow *window,
return status == GDK_GRAB_SUCCESS;
}
static gboolean
gtk_combo_box_grab_broken_event (GtkWidget *widget,
GdkEventGrabBroken *event,
gpointer user_data)
{
GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
if (event->grab_window == NULL)
gtk_combo_box_popdown (combo_box);
return TRUE;
}
/**
* gtk_combo_box_popup:
* @combo_box: a #GtkComboBox
@ -2362,11 +2365,6 @@ gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
}
priv->grab_pointer = pointer;
g_signal_connect (priv->popup_window,
"grab-broken-event",
G_CALLBACK (gtk_combo_box_grab_broken_event),
combo_box);
}
static void