[gtk+/wip/garnacho/gdkseat: 11/14] GtkEntryCompletion: Use gdk_seat_grab()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/garnacho/gdkseat: 11/14] GtkEntryCompletion: Use gdk_seat_grab()
- Date: Thu, 26 Nov 2015 19:28:32 +0000 (UTC)
commit 7af89bc10bb8c4ac45b5480c9021e0518cda955a
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Nov 26 19:55:45 2015 +0100
GtkEntryCompletion: Use gdk_seat_grab()
gtk/gtkentrycompletion.c | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 9acae9d..f141d0d 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1609,6 +1609,22 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
}
static void
+prepare_popup_func (GdkSeat *seat,
+ GdkWindow *window,
+ gpointer user_data)
+{
+ GtkEntryCompletion *completion = user_data;
+
+ /* prevent the first row being focused */
+ gtk_widget_grab_focus (completion->priv->tree_view);
+
+ gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW
(completion->priv->tree_view)));
+ gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW
(completion->priv->action_view)));
+
+ gtk_widget_show (completion->priv->popup_window);
+}
+
+static void
gtk_entry_completion_popup (GtkEntryCompletion *completion)
{
GtkWidget *toplevel;
@@ -1643,26 +1659,39 @@ gtk_entry_completion_popup (GtkEntryCompletion *completion)
GTK_WINDOW (completion->priv->popup_window));
}
+#if 0
/* prevent the first row being focused */
gtk_widget_grab_focus (completion->priv->tree_view);
gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW
(completion->priv->tree_view)));
gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW
(completion->priv->action_view)));
+#endif
gtk_window_set_screen (GTK_WINDOW (completion->priv->popup_window),
gtk_widget_get_screen (completion->priv->entry));
+#if 0
gtk_widget_show (completion->priv->popup_window);
+#endif
if (completion->priv->device)
{
- gtk_device_grab_add (completion->priv->popup_window, completion->priv->device, TRUE);
+ gtk_grab_add (completion->priv->popup_window);
+#if 1
+ gdk_seat_grab (gdk_device_get_seat (completion->priv->device),
+ gtk_widget_get_window (completion->priv->popup_window),
+ GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH,
+ TRUE, NULL, NULL,
+ prepare_popup_func, completion);
+#endif
+#if 0
gdk_device_grab (completion->priv->device, gtk_widget_get_window (completion->priv->popup_window),
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, GDK_CURRENT_TIME);
+#endif
completion->priv->has_grab = TRUE;
}
@@ -1678,9 +1707,8 @@ _gtk_entry_completion_popdown (GtkEntryCompletion *completion)
if (completion->priv->has_grab)
{
- gdk_device_ungrab (completion->priv->device, GDK_CURRENT_TIME);
- gtk_device_grab_remove (completion->priv->popup_window,
- completion->priv->device);
+ gdk_seat_ungrab (gdk_device_get_seat (completion->priv->device));
+ gtk_grab_remove (completion->priv->popup_window);
completion->priv->has_grab = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]