Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

label: Make default activation work in roots

Browse Source 
Use the GtkRoot API when activating the default widget.
This makes things work in GtkWindow and GtkPopup.
This commit is contained in:
Matthias Clasen
2019-03-03 20:10:06 -05:00
parent 509695702f
commit 1cf4a31541
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtklabel.c
View File

@@ -6203,31 +6203,9 @@ gtk_label_activate_current_link (GtkLabel *label)
link = gtk_label_get_focus_link (label);
if (link)
{
emit_activate_link (label, link);
}
emit_activate_link (label, link);
else
{
GtkWidget *toplevel;
GtkWindow *window;
GtkWidget *default_widget, *focus_widget;
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel))
{
window = GTK_WINDOW (toplevel);
if (window)
{
default_widget = gtk_window_get_default_widget (window);
focus_widget = gtk_root_get_focus (GTK_ROOT (window));
if (default_widget != widget &&
!(widget == focus_widget && (!default_widget || !gtk_widget_is_sensitive (default_widget))))
gtk_window_activate_default (window);
}
}
}
gtk_root_activate_default (gtk_widget_get_root (widget));
}
static GtkLabelLink *