summary refs log tree commit diff stats
path: root/ui/sdl2.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-06-14 14:04:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-06-14 14:04:14 +0100
commit409c241f887a38bb7a2ac12e34d3a8d73922a9a5 (patch)
treee1ca801582db08673758bf7159638acab73bcd10 /ui/sdl2.c
parent666b0e732f694c995797e2a31ba19138ce4f69eb (diff)
parent64bf97e56f3ab44d587c92c40503d646273a24df (diff)
downloadfocaccia-qemu-409c241f887a38bb7a2ac12e34d3a8d73922a9a5.tar.gz
focaccia-qemu-409c241f887a38bb7a2ac12e34d3a8d73922a9a5.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging
ui: bugfixes for sdl and gtk

# gpg: Signature made Thu 14 Jun 2018 09:32:45 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20180614-pull-request:
  sdl2: restore window dimensions by resize
  ui: darwin: gtk: Add missing input keymap

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2.c')
-rw-r--r--ui/sdl2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/sdl2.c b/ui/sdl2.c
index a0f9b16bc1..3ae4719c32 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -371,8 +371,7 @@ static void handle_keydown(SDL_Event *ev)
             }
             break;
         case SDL_SCANCODE_U:
-            sdl2_window_destroy(scon);
-            sdl2_window_create(scon);
+            sdl2_window_resize(scon);
             if (!scon->opengl) {
                 /* re-create scon->texture */
                 sdl2_2d_switch(&scon->dcl, scon->surface);