Commit 22df3452 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20140711-1' into staging 



ui/gtk: Restore keyboard focus after Page change

# gpg: Signature made Fri 11 Jul 2014 09:46:21 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-gtk-20140711-1:
  ui/gtk: Restore keyboard focus after Page change

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 74aeb37d e72b59fa

ui/gtk.c

+6 −3
Original line number Diff line number Diff line
@@ -992,13 +992,16 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) 
{

    GtkDisplayState *s = opaque;

    VirtualConsole *vc = gd_vc_find_by_menu(s);

    GtkNotebook *nb = GTK_NOTEBOOK(s->notebook);

    GtkWidget *child;

    gint page;



    gtk_release_modifiers(s);

    if (vc) {

        page = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook),

                                     vc->tab_item);

        gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), page);

        page = gtk_notebook_page_num(nb, vc->tab_item);

        gtk_notebook_set_current_page(nb, page);

        child = gtk_notebook_get_nth_page(nb, page);

        gtk_widget_grab_focus(child);

    }

}