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

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Fix menu keynav

See merge request GNOME/gtk!1760
This commit is contained in:
Matthias Clasen 2020-04-25 16:56:18 +00:00
commit ba1633ce75
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkpopovermenu.c
View File

@ -193,7 +193,8 @@ leave_cb (GtkEventController *controller,
target = gtk_event_controller_get_widget (controller);
gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (target), NULL);
if (mode == GDK_CROSSING_NORMAL)
gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (target), NULL);
}
static void
@ -321,19 +322,28 @@ static gboolean
gtk_popover_menu_focus (GtkWidget *widget,
GtkDirectionType direction)
{
GtkPopoverMenu *menu = GTK_POPOVER_MENU (widget);
if (gtk_widget_get_first_child (widget) == NULL)
{
return FALSE;
}
else
{
if (GTK_POPOVER_MENU (widget)->open_submenu)
if (menu->open_submenu)
{
if (gtk_widget_child_focus (GTK_POPOVER_MENU (widget)->open_submenu, direction))
if (gtk_widget_child_focus (menu->open_submenu, direction))
return TRUE;
if (direction == GTK_DIR_LEFT)
{
gtk_widget_grab_focus (GTK_POPOVER_MENU (widget)->active_item);
if (menu->open_submenu)
{
gtk_popover_popdown (GTK_POPOVER (menu->open_submenu));
menu->open_submenu = NULL;
}
gtk_widget_grab_focus (menu->active_item);
return TRUE;
}
return FALSE;
@ -349,7 +359,7 @@ gtk_popover_menu_focus (GtkWidget *widget,
* we eat them.
*/
if (gtk_widget_get_ancestor (widget, GTK_TYPE_POPOVER_MENU_BAR) ||
(gtk_popover_menu_get_parent_menu (GTK_POPOVER_MENU (widget)) &&
(gtk_popover_menu_get_parent_menu (menu) &&
direction == GTK_DIR_LEFT))
return FALSE;
else
@ -360,7 +370,7 @@ gtk_popover_menu_focus (GtkWidget *widget,
GtkWidget *p;
/* cycle around */
for (p = gtk_window_get_focus (GTK_WINDOW (gtk_widget_get_root (widget)));
for (p = gtk_root_get_focus (gtk_widget_get_root (widget));
p != widget;
p = gtk_widget_get_parent (p))
{