diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-12 13:53:44 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-12 13:53:44 +0000 |
| commit | 3f8d1885e48e4d72eab0688f604de62e0aea7a38 (patch) | |
| tree | aea42a91648b3a726e135b910e46faa0605bcd18 /ui/gtk.c | |
| parent | 1941858448e76f83eb00614c4f34ac29e9a8e792 (diff) | |
| parent | d1929069e355afb809a50a7f6b6affdea399cc8c (diff) | |
| download | qemu-3f8d1885e48e4d72eab0688f604de62e0aea7a38.zip qemu-3f8d1885e48e4d72eab0688f604de62e0aea7a38.tar.gz qemu-3f8d1885e48e4d72eab0688f604de62e0aea7a38.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210311-pull-request' into staging
ui: mostly cocoa fixes
# gpg: Signature made Thu 11 Mar 2021 12:33:51 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20210311-pull-request:
ui/cocoa: Fix mouse association state
ui/cocoa: Mark variables static
ui/cocoa: Clear modifiers whenever possible
ui/cocoa: Do not rely on the first argument
ui/cocoa: Show QEMU icon in the about window
docs: Fix removal text of -show-cursor
ui/cocoa: Use kCGColorSpaceSRGB
ui/gtk: Remove NULL checks in gd_switch
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/gtk.c')
| -rw-r--r-- | ui/gtk.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -547,9 +547,7 @@ static void gd_switch(DisplayChangeListener *dcl, VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); bool resized = true; - trace_gd_switch(vc->label, - surface ? surface_width(surface) : 0, - surface ? surface_height(surface) : 0); + trace_gd_switch(vc->label, surface_width(surface), surface_height(surface)); if (vc->gfx.surface) { cairo_surface_destroy(vc->gfx.surface); @@ -560,7 +558,7 @@ static void gd_switch(DisplayChangeListener *dcl, vc->gfx.convert = NULL; } - if (vc->gfx.ds && surface && + if (vc->gfx.ds && surface_width(vc->gfx.ds) == surface_width(surface) && surface_height(vc->gfx.ds) == surface_height(surface)) { resized = false; |