gtk: Update GtkPointerFocus targets on mapping/sensitivity changes

Those are situations that must cause foci on these widgets to repick
themselves.
This commit is contained in:
Carlos Garnacho 2017-03-31 17:49:21 +02:00
parent f57f48d61f
commit 8f24df1c19
3 changed files with 49 additions and 0 deletions

View File

@ -4448,6 +4448,19 @@ gtk_widget_hide_on_delete (GtkWidget *widget)
return TRUE;
}
static void
update_cursor_on_state_change (GtkWidget *widget)
{
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget);
if (!GTK_IS_WINDOW (toplevel))
return;
gtk_window_update_pointer_focus_on_state_change (GTK_WINDOW (toplevel),
widget);
}
/**
* gtk_widget_map:
* @widget: a #GtkWidget
@ -4471,6 +4484,8 @@ gtk_widget_map (GtkWidget *widget)
g_signal_emit (widget, widget_signals[MAP], 0);
update_cursor_on_state_change (widget);
if (!_gtk_widget_get_has_window (widget))
gtk_widget_queue_draw (widget);
@ -4501,6 +4516,8 @@ gtk_widget_unmap (GtkWidget *widget)
g_signal_emit (widget, widget_signals[UNMAP], 0);
update_cursor_on_state_change (widget);
gtk_widget_pop_verify_invariants (widget);
g_object_unref (widget);
}
@ -8405,6 +8422,7 @@ gtk_widget_set_sensitive (GtkWidget *widget,
}
gtk_widget_propagate_state (widget, &data);
update_cursor_on_state_change (widget);
}
g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_SENSITIVE]);

View File

@ -11456,3 +11456,31 @@ gtk_window_update_pointer_focus (GtkWindow *window,
gtk_window_add_pointer_focus (window, focus);
}
}
void
gtk_window_update_pointer_focus_on_state_change (GtkWindow *window,
GtkWidget *widget)
{
GList *l = window->priv->foci, *cur;
while (l)
{
GtkPointerFocus *focus = l->data;
cur = l;
focus = cur->data;
l = cur->next;
if (GTK_WIDGET (focus->toplevel) == widget)
{
/* Unmapping the toplevel, remove pointer focus */
gtk_window_remove_pointer_focus (window, focus);
gtk_pointer_focus_free (focus);
}
else if (focus->target == widget ||
gtk_widget_is_ancestor (focus->target, widget))
{
gtk_pointer_focus_repick_target (focus);
}
}
}

View File

@ -154,6 +154,9 @@ void gtk_window_update_pointer_focus (GtkWindow *window,
gdouble x,
gdouble y);
void gtk_window_update_pointer_focus_on_state_change (GtkWindow *window,
GtkWidget *widget);
G_END_DECLS
#endif /* __GTK_WINDOW_PRIVATE_H__ */