AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

main: Flip set_widget_active_state() logic

Browse Source 
The function used to take a boolean, just to set the active state of the
widget to the exact opposite of that boolean. Fix that.
This commit is contained in:
Timm Bäder 2021-10-17 11:21:00 +02:00
parent 03d4ac1863
commit e7ac8275ea
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkmain.c
View File

@ -1290,19 +1290,15 @@ is_key_event (GdkEvent *event)
} }
static inline void static inline void
set_widget_active_state (GtkWidget *target, set_widget_active_state (GtkWidget *target,
const gboolean release) const gboolean is_active)
{ {
GtkWidget *w; GtkWidget *w;
w = target; w = target;
while (w) while (w)
{ {
if (release) gtk_widget_set_active_state (w, is_active);
gtk_widget_set_active_state (w, FALSE);
else
gtk_widget_set_active_state (w, TRUE);
w = _gtk_widget_get_parent (w); w = _gtk_widget_get_parent (w);
} }
} }
@ -1353,7 +1349,7 @@ handle_pointing_event (GdkEvent *event)
case GDK_TOUCH_CANCEL: case GDK_TOUCH_CANCEL:
old_target = update_pointer_focus_state (toplevel, event, NULL); old_target = update_pointer_focus_state (toplevel, event, NULL);
if (type == GDK_TOUCH_END || type == GDK_TOUCH_CANCEL) if (type == GDK_TOUCH_END || type == GDK_TOUCH_CANCEL)
set_widget_active_state (old_target, TRUE); set_widget_active_state (old_target, FALSE);
else if (type == GDK_LEAVE_NOTIFY) else if (type == GDK_LEAVE_NOTIFY)
gtk_synthesize_crossing_events (GTK_ROOT (toplevel), GTK_CROSSING_POINTER, old_target, NULL, gtk_synthesize_crossing_events (GTK_ROOT (toplevel), GTK_CROSSING_POINTER, old_target, NULL,
event, gdk_crossing_event_get_mode (event), NULL); event, gdk_crossing_event_get_mode (event), NULL);
@ -1408,7 +1404,7 @@ handle_pointing_event (GdkEvent *event)
else if (type == GDK_TOUCH_BEGIN) else if (type == GDK_TOUCH_BEGIN)
{ {
gtk_window_set_pointer_focus_grab (toplevel, device, sequence, target); gtk_window_set_pointer_focus_grab (toplevel, device, sequence, target);
set_widget_active_state (target, FALSE); set_widget_active_state (target, TRUE);
} }
/* Let it take the effective pointer focus anyway, as it may change due /* Let it take the effective pointer focus anyway, as it may change due
@ -1453,9 +1449,9 @@ handle_pointing_event (GdkEvent *event)
} }
if (type == GDK_BUTTON_PRESS) if (type == GDK_BUTTON_PRESS)
set_widget_active_state (target, FALSE);
else if (has_implicit)
set_widget_active_state (target, TRUE); set_widget_active_state (target, TRUE);
else if (has_implicit)
set_widget_active_state (target, FALSE);
break; break;
case GDK_SCROLL: case GDK_SCROLL:
@ -1468,7 +1464,7 @@ handle_pointing_event (GdkEvent *event)
target = gtk_window_lookup_effective_pointer_focus_widget (toplevel, target = gtk_window_lookup_effective_pointer_focus_widget (toplevel,
device, device,
sequence); sequence);
set_widget_active_state (target, TRUE); set_widget_active_state (target, FALSE);
} }
break; break;
default: default: