[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/9] ui/cocoa: Redraw at correct size when switching
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 6/9] ui/cocoa: Redraw at correct size when switching surface |
Date: |
Sun, 12 Jan 2014 22:52:35 +0000 |
If the surface switch involved a resize, we were doing the redraw
at the old size rather than the new, because the update of
screen.width and screen.height was being done after the setFrame
method calls which triggered a redraw. Normally this isn't very
noticeable because typically after the guest triggers the window
resize it also draws something to it, which will in turn cause
us to redraw. However, the combination of a guest which never
draws to the display and a command line setting of a screen size
larger than the default can reveal odd effects.
Move most of the handling of resizes to the top of the method,
and guard it with a check that the surface size actually changed,
to avoid unnecessary operations (including some user visible ones
like "recenter the window on the screen") if the surface is the
same size as the old one.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
---
ui/cocoa.m | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index b90b782..6a1f6b6 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -405,6 +405,17 @@ QemuCocoaView *cocoaView;
int w = surface_width(surface);
int h = surface_height(surface);
+ bool isResize = (w != screen.width || h != screen.height);
+
+ int oldh = screen.height;
+ if (isResize) {
+ // Resize before we trigger the redraw, or we'll redraw at the wrong
size
+ COCOA_DEBUG("switchSurface: new size %d x %d\n", w, h);
+ screen.width = w;
+ screen.height = h;
+ [self setContentDimensions];
+ [self setFrame:NSMakeRect(cx, cy, cw, ch)];
+ }
// update screenBuffer
if (dataProviderRef)
@@ -419,17 +430,16 @@ QemuCocoaView *cocoaView;
// update windows
if (isFullscreen) {
[[fullScreenWindow contentView] setFrame:[[NSScreen mainScreen]
frame]];
- [normalWindow setFrame:NSMakeRect([normalWindow frame].origin.x,
[normalWindow frame].origin.y - h + screen.height, w, h + [normalWindow
frame].size.height - screen.height) display:NO animate:NO];
+ [normalWindow setFrame:NSMakeRect([normalWindow frame].origin.x,
[normalWindow frame].origin.y - h + oldh, w, h + [normalWindow
frame].size.height - oldh) display:NO animate:NO];
} else {
if (qemu_name)
[normalWindow setTitle:[NSString stringWithFormat:@"QEMU %s",
qemu_name]];
- [normalWindow setFrame:NSMakeRect([normalWindow frame].origin.x,
[normalWindow frame].origin.y - h + screen.height, w, h + [normalWindow
frame].size.height - screen.height) display:YES animate:NO];
+ [normalWindow setFrame:NSMakeRect([normalWindow frame].origin.x,
[normalWindow frame].origin.y - h + oldh, w, h + [normalWindow
frame].size.height - oldh) display:YES animate:NO];
+ }
+
+ if (isResize) {
+ [normalWindow center];
}
- screen.width = w;
- screen.height = h;
- [normalWindow center];
- [self setContentDimensions];
- [self setFrame:NSMakeRect(cx, cy, cw, ch)];
}
- (void) toggleFullScreen:(id)sender
--
1.8.5
- [Qemu-devel] [PULL 0/9] cocoa queue, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 5/9] ui/cocoa: Fix code for starting QEMU via image file load dialog, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 3/9] ui/cocoa: Send warning message to stderr, not stdout, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 6/9] ui/cocoa: Redraw at correct size when switching surface,
Peter Maydell <=
- [Qemu-devel] [PULL 4/9] ui/cocoa: Add ".qcow2" to extension list for image load dialog, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 2/9] ui/cocoa: Correct typos in comments and variable names, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 9/9] MAINTAINERS: add myself as cocoa UI co-maintainer, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 1/9] ui/cocoa: Pass command key through to guest when VM has mousegrab, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 7/9] ui/cocoa: Draw black rectangle if we have no data yet, Peter Maydell, 2014/01/12
- [Qemu-devel] [PULL 8/9] ui/cocoa: Remove stray tabs, Peter Maydell, 2014/01/12