[gtk+/gtk-2-24] combobox: popdown the combobox when on 'grab-broken-event'
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] combobox: popdown the combobox when on 'grab-broken-event'
- Date: Tue, 12 Mar 2013 11:54:12 +0000 (UTC)
commit b994bcd4f2e866a6c6d2360cb9b6fe64f1457d41
Author: Aleksander Morgado <aleksander lanedo com>
Date: Tue Mar 5 16:43:58 2013 +0100
combobox: popdown the combobox when on 'grab-broken-event'
And also explicitly remove pointer/keyboard grabs from the display.
Whenever the grab is reported lost, we should popdown the combobox, so that the
GDK_WINDOW_TEMP window is hidden and removed from the toplevel, as done with
the menu for example.
Leaving the GDK_WINDOW_TEMP window open when re-activating the application
triggers several issues in the win32 backend, due to restacking windows of the
non-toplevel group into the toplevel group:
https://bugzilla.gnome.org/show_bug.cgi?id=695200
gtk/gtkcombobox.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index be968d6..dc912a3 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2040,6 +2040,19 @@ popup_grab_on_window (GdkWindow *window,
return FALSE;
}
+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
@@ -2129,6 +2142,11 @@ gtk_combo_box_real_popup (GtkComboBox *combo_box)
}
gtk_grab_add (priv->popup_window);
+
+ g_signal_connect (priv->popup_window,
+ "grab-broken-event",
+ G_CALLBACK (gtk_combo_box_grab_broken_event),
+ combo_box);
}
static gboolean
@@ -2158,6 +2176,7 @@ void
gtk_combo_box_popdown (GtkComboBox *combo_box)
{
GtkComboBoxPrivate *priv = combo_box->priv;
+ GdkDisplay *display;
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
@@ -2171,6 +2190,11 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
return;
gtk_grab_remove (priv->popup_window);
+
+ display = gtk_widget_get_display (GTK_WIDGET (combo_box));
+ gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
+ gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
+
gtk_widget_hide_all (priv->popup_window);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button),
FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]