[gtk/wip/matthiasc/popup2: 41/51] small fixup
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup2: 41/51] small fixup
- Date: Mon, 18 Mar 2019 12:48:38 +0000 (UTC)
commit c155825a812267573089da66d013080258e84027
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Mar 17 13:53:40 2019 -0400
small fixup
gtk/gtkpopup.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtkpopup.c b/gtk/gtkpopup.c
index 22ccb7bd46..73f9e548ca 100644
--- a/gtk/gtkpopup.c
+++ b/gtk/gtkpopup.c
@@ -841,12 +841,10 @@ gtk_popup_root_update_pointer_focus_on_state_change (GtkRoot *root,
gtk_pointer_focus_ref (focus);
-#if 0
if (focus->grab_widget &&
(focus->grab_widget == widget ||
gtk_widget_is_ancestor (focus->grab_widget, widget)))
gtk_pointer_focus_set_implicit_grab (focus, NULL);
-#endif
if (GTK_WIDGET (focus->toplevel) == widget)
{
@@ -965,8 +963,8 @@ gtk_popup_root_maybe_update_cursor (GtkRoot *root,
for (l = priv->foci; l; l = l->next)
{
GtkPointerFocus *focus = l->data;
- GtkWidget *grab_widget, *target;
- //GtkWindowGroup *group;
+ GtkWidget *grab_widget = NULL;
+ GtkWidget *target;
if (focus->sequence)
continue;
@@ -974,13 +972,12 @@ gtk_popup_root_maybe_update_cursor (GtkRoot *root,
continue;
#if 0
- group = gtk_window_get_group (window);
- grab_widget = gtk_window_group_get_current_device_grab (group,
- focus->device);
- if (!grab_widget)
- grab_widget = gtk_window_group_get_current_grab (group);
-#else
- grab_widget = NULL;
+ {
+ GtkWindowGroup *group = gtk_window_get_group (root);
+ grab_widget = gtk_window_group_get_current_device_grab (group, focus->device);
+ if (!grab_widget)
+ grab_widget = gtk_window_group_get_current_grab (group);
+ }
#endif
if (!grab_widget)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]