AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkwidget: Avoid use of shadowed flag

Browse Source 
This is going away, look up whether there is a grab, and whether
the widget is within it, instead.
This commit is contained in:
Carlos Garnacho 2020-06-24 18:24:12 +02:00
parent f046e27bb4
commit 102d2a36f3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwidget.c
View File

@ -7573,8 +7573,18 @@ gtk_widget_propagate_state (GtkWidget *widget,
if (old_flags != new_flags) if (old_flags != new_flags)
{ {
GtkWindowGroup *window_group;
GtkRoot *root;
GtkWidget *grab;
gboolean shadowed;
g_object_ref (widget); g_object_ref (widget);
root = gtk_widget_get_root (widget);
window_group = gtk_window_get_group (GTK_WINDOW (root));
grab = gtk_window_group_get_current_grab (window_group);
shadowed = grab && grab != widget && !gtk_widget_is_ancestor (widget, grab);
if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget)) if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget))
gtk_grab_remove (widget); gtk_grab_remove (widget);
@ -7582,7 +7592,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
g_signal_emit (widget, widget_signals[STATE_FLAGS_CHANGED], 0, old_flags); g_signal_emit (widget, widget_signals[STATE_FLAGS_CHANGED], 0, old_flags);
if (!priv->shadowed && if (!shadowed &&
(new_flags & GTK_STATE_FLAG_INSENSITIVE) != (old_flags & GTK_STATE_FLAG_INSENSITIVE)) (new_flags & GTK_STATE_FLAG_INSENSITIVE) != (old_flags & GTK_STATE_FLAG_INSENSITIVE))
{ {
guint i, n_devices; guint i, n_devices;