Merge branch 'popover-initial-focus' into 'master'

Popover initial focus

See merge request GNOME/gtk!1657
This commit is contained in:
Matthias Clasen 2020-04-10 04:17:15 +00:00
commit 0ed2e970be
2 changed files with 1 additions and 1 deletions

View File

@ -1387,6 +1387,7 @@ gtk_model_button_init (GtkModelButton *self)
gtk_widget_add_controller (GTK_WIDGET (self), controller);
controller = gtk_event_controller_focus_new ();
gtk_event_controller_set_propagation_limit (controller, GTK_LIMIT_NONE);
g_signal_connect (controller, "enter", G_CALLBACK (focus_in_cb), NULL);
gtk_widget_add_controller (GTK_WIDGET (self), controller);

View File

@ -329,7 +329,6 @@ gtk_popover_menu_focus (GtkWidget *widget,
{
if (GTK_POPOVER_MENU (widget)->open_submenu)
{
g_print ("open submenu\n");
if (gtk_widget_child_focus (GTK_POPOVER_MENU (widget)->open_submenu, direction))
return TRUE;
if (direction == GTK_DIR_LEFT)