OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ui/cocoa: Remove stretch_video flag

Browse Source 
Evaluate [normalWindow styleMask] & NSWindowStyleMaskResizable instead.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Rene Engel <ReneEngel80@emailn.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20240224-cocoa-v12-10-e89f70bdda71@daynix.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Akihiko Odaki 2024-02-24 21:43:41 +09:00 committed by Philippe Mathieu-Daudé
parent 4b49f92ce1
commit 5576663208
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/cocoa.m
View File

@ -106,7 +106,6 @@ static int cursor_hide = 1;
static int left_command_key_enabled = 1; static int left_command_key_enabled = 1;
static bool swap_opt_cmd; static bool swap_opt_cmd;
static bool stretch_video;
static CGInterpolationQuality zoom_interpolation = kCGInterpolationNone; static CGInterpolationQuality zoom_interpolation = kCGInterpolationNone;
static NSTextField *pauseLabel; static NSTextField *pauseLabel;
@ -522,7 +521,7 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
{ {
[[self window] setContentAspectRatio:NSMakeSize(screen.width, screen.height)]; [[self window] setContentAspectRatio:NSMakeSize(screen.width, screen.height)];
if (!stretch_video) { if (!([[self window] styleMask] & NSWindowStyleMaskResizable)) {
[[self window] setContentSize:NSMakeSize(screen.width, screen.height)]; [[self window] setContentSize:NSMakeSize(screen.width, screen.height)];
[[self window] center]; [[self window] center];
} else if ([[self window] styleMask] & NSWindowStyleMaskFullScreen) { } else if ([[self window] styleMask] & NSWindowStyleMaskFullScreen) {
@ -1354,15 +1353,10 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
/* Stretches video to fit host monitor size */ /* Stretches video to fit host monitor size */
- (void)zoomToFit:(id) sender - (void)zoomToFit:(id) sender
{ {
stretch_video = !stretch_video; NSWindowStyleMask styleMask = [[cocoaView window] styleMask] ^ NSWindowStyleMaskResizable;
if (stretch_video == true) {
[cocoaView window].styleMask |= NSWindowStyleMaskResizable; [[cocoaView window] setStyleMask:styleMask];
[sender setState: NSControlStateValueOn]; [sender setState:styleMask & NSWindowStyleMaskResizable ? NSControlStateValueOn : NSControlStateValueOff];
} else {
[cocoaView window].styleMask &= ~NSWindowStyleMaskResizable;
[cocoaView resizeWindow];
[sender setState: NSControlStateValueOff];
}
} }
- (void)toggleZoomInterpolation:(id) sender - (void)toggleZoomInterpolation:(id) sender
@ -1638,7 +1632,7 @@ static void create_initial_menus(void)
menu = [[NSMenu alloc] initWithTitle:@"View"]; menu = [[NSMenu alloc] initWithTitle:@"View"];
[menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Enter Fullscreen" action:@selector(doToggleFullScreen:) keyEquivalent:@"f"] autorelease]]; // Fullscreen [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Enter Fullscreen" action:@selector(doToggleFullScreen:) keyEquivalent:@"f"] autorelease]]; // Fullscreen
menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom To Fit" action:@selector(zoomToFit:) keyEquivalent:@""] autorelease]; menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom To Fit" action:@selector(zoomToFit:) keyEquivalent:@""] autorelease];
[menuItem setState: stretch_video ? NSControlStateValueOn : NSControlStateValueOff]; [menuItem setState: [[cocoaView window] styleMask] & NSWindowStyleMaskResizable ? NSControlStateValueOn : NSControlStateValueOff];
[menu addItem: menuItem]; [menu addItem: menuItem];
menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom Interpolation" action:@selector(toggleZoomInterpolation:) keyEquivalent:@""] autorelease]; menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom Interpolation" action:@selector(toggleZoomInterpolation:) keyEquivalent:@""] autorelease];
[menuItem setState: zoom_interpolation == kCGInterpolationLow ? NSControlStateValueOn : NSControlStateValueOff]; [menuItem setState: zoom_interpolation == kCGInterpolationLow ? NSControlStateValueOn : NSControlStateValueOff];
@ -2027,7 +2021,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
} }
if (opts->u.cocoa.has_zoom_to_fit && opts->u.cocoa.zoom_to_fit) { if (opts->u.cocoa.has_zoom_to_fit && opts->u.cocoa.zoom_to_fit) {
stretch_video = true;
[cocoaView window].styleMask |= NSWindowStyleMaskResizable; [cocoaView window].styleMask |= NSWindowStyleMaskResizable;
} }