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

window: Emit GTK_CROSSING_ACTIVE crossing events

Browse Source 
Emit crossing events when the active window changes.
We don't want to emit GTK_CROSSING_FOCUS events, since
every window has its own focus location (focus does not
jump from window to window), so we use the new
GTK_CROSSING_ACTIVE type of crossing event for this.
This commit is contained in:
Matthias Clasen 2020-07-30 13:22:26 -04:00
parent 12170acf46
commit b0d40403e1
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkwindow.c
View File

@ -1834,9 +1834,10 @@ gtk_window_root_get_focus (GtkRoot *root)
return priv->focus_widget; return priv->focus_widget;
} }
static void synthesize_focus_change_events (GtkWindow *window, static void synthesize_focus_change_events (GtkWindow *window,
GtkWidget *old_focus, GtkWidget *old_focus,
GtkWidget *new_focus); GtkWidget *new_focus,
GtkCrossingType type);
static void static void
gtk_window_root_set_focus (GtkRoot *root, gtk_window_root_set_focus (GtkRoot *root,
@ -1859,7 +1860,7 @@ gtk_window_root_set_focus (GtkRoot *root,
if (old_focus) if (old_focus)
gtk_widget_set_has_focus (old_focus, FALSE); gtk_widget_set_has_focus (old_focus, FALSE);
synthesize_focus_change_events (self, old_focus, focus); synthesize_focus_change_events (self, old_focus, focus, GTK_CROSSING_FOCUS);
if (focus) if (focus)
gtk_widget_set_has_focus (focus, TRUE); gtk_widget_set_has_focus (focus, TRUE);
@ -4984,9 +4985,10 @@ check_crossing_invariants (GtkWidget *widget,
} }
static void static void
synthesize_focus_change_events (GtkWindow *window, synthesize_focus_change_events (GtkWindow *window,
GtkWidget *old_focus, GtkWidget *old_focus,
GtkWidget *new_focus) GtkWidget *new_focus,
GtkCrossingType type)
{ {
GtkCrossingData crossing; GtkCrossingData crossing;
GtkWidget *ancestor; GtkWidget *ancestor;
@ -5005,7 +5007,7 @@ synthesize_focus_change_events (GtkWindow *window,
if (gtk_window_get_focus_visible (GTK_WINDOW (window))) if (gtk_window_get_focus_visible (GTK_WINDOW (window)))
flags |= GTK_STATE_FLAG_FOCUS_VISIBLE; flags |= GTK_STATE_FLAG_FOCUS_VISIBLE;
crossing.type = GTK_CROSSING_FOCUS; crossing.type = type;
crossing.mode = GDK_CROSSING_NORMAL; crossing.mode = GDK_CROSSING_NORMAL;
crossing.old_target = old_focus; crossing.old_target = old_focus;
crossing.old_descendent = NULL; crossing.old_descendent = NULL;
@ -5038,7 +5040,7 @@ synthesize_focus_change_events (GtkWindow *window,
{ {
crossing.new_descendent = NULL; crossing.new_descendent = NULL;
} }
check_crossing_invariants (widget, &crossing); check_crossing_invariants (widget, &crossing);
gtk_widget_handle_crossing (widget, &crossing, 0, 0); gtk_widget_handle_crossing (widget, &crossing, 0, 0);
gtk_widget_unset_state_flags (widget, flags); gtk_widget_unset_state_flags (widget, flags);
@ -6303,14 +6305,14 @@ gtk_window_keys_changed (GtkWindow *window)
* _gtk_window_set_is_active: * _gtk_window_set_is_active:
* @window: a #GtkWindow * @window: a #GtkWindow
* @is_active: %TRUE if the window is in the currently active toplevel * @is_active: %TRUE if the window is in the currently active toplevel
* *
* Internal function that sets whether the #GtkWindow is part * Internal function that sets whether the #GtkWindow is part
* of the currently active toplevel window (taking into account inter-process * of the currently active toplevel window (taking into account inter-process
* embedding.) * embedding.)
**/ **/
static void static void
_gtk_window_set_is_active (GtkWindow *window, _gtk_window_set_is_active (GtkWindow *window,
gboolean is_active) gboolean is_active)
{ {
GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
@ -6319,6 +6321,20 @@ _gtk_window_set_is_active (GtkWindow *window,
priv->is_active = is_active; priv->is_active = is_active;
if (priv->focus_widget)
{
GtkWidget *focus;
focus = g_object_ref (priv->focus_widget);
if (is_active)
synthesize_focus_change_events (window, NULL, focus, GTK_CROSSING_ACTIVE);
else
synthesize_focus_change_events (window, focus, NULL, GTK_CROSSING_ACTIVE);
g_object_unref (focus);
}
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_IS_ACTIVE]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_IS_ACTIVE]);
} }