Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 14:54:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui/cocoa: add zoom-to-fit display option

Browse Source 
Provides a display option, zoom-to-fit, that enables scaling of the
display when full-screen mode is enabled.

Also ensures that the corresponding menu item is marked as enabled when
the option is set to on.

Signed-off-by: Carwyn Ellis <carwynellis@gmail.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-Id: <20231027154920.80626-2-carwynellis@gmail.com>
This commit is contained in:
Carwyn Ellis 2023-10-27 16:49:20 +01:00 committed by Marc-André Lureau
parent 47fd6ab1e3
commit 5ec0898b05
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qapi/ui.json
View File

@ -1409,13 +1409,18 @@
# codes match their position on non-Mac keyboards and you can use # codes match their position on non-Mac keyboards and you can use
# Meta/Super and Alt where you expect them. (default: off) # Meta/Super and Alt where you expect them. (default: off)
# #
# @zoom-to-fit: Zoom guest display to fit into the host window. When
# turned off the host window will be resized instead. Defaults to
# "off". (Since 8.2)
#
# Since: 7.0 # Since: 7.0
## ##
{ 'struct': 'DisplayCocoa', { 'struct': 'DisplayCocoa',
'data': { 'data': {
'*left-command-key': 'bool', '*left-command-key': 'bool',
'*full-grab': 'bool', '*full-grab': 'bool',
'*swap-opt-cmd': 'bool' '*swap-opt-cmd': 'bool',
'*zoom-to-fit': 'bool'
} } } }
## ##

32
ui/cocoa.m
View File

@ -1247,7 +1247,6 @@ - (id) init
[normalWindow makeKeyAndOrderFront:self]; [normalWindow makeKeyAndOrderFront:self];
[normalWindow center]; [normalWindow center];
[normalWindow setDelegate: self]; [normalWindow setDelegate: self];
stretch_video = false;
/* Used for displaying pause on the screen */ /* Used for displaying pause on the screen */
pauseLabel = [NSTextField new]; pauseLabel = [NSTextField new];
@ -1671,7 +1670,9 @@ static void create_initial_menus(void)
// View menu // View menu
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
[menu addItem: [[[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];
[menu addItem: menuItem];
menuItem = [[[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""] autorelease]; menuItem = [[[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu]; [menuItem setSubmenu:menu];
[[NSApp mainMenu] addItem:menuItem]; [[NSApp mainMenu] addItem:menuItem];
@ -2041,18 +2042,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
[QemuApplication sharedApplication]; [QemuApplication sharedApplication];
create_initial_menus();
/*
* Create the menu entries which depend on QEMU state (for consoles
* and removable devices). These make calls back into QEMU functions,
* which is OK because at this point we know that the second thread
* holds the iothread lock and is synchronously waiting for us to
* finish.
*/
add_console_menu_entries();
addRemovableDevicesMenuItems();
// Create an Application controller // Create an Application controller
QemuCocoaAppController *controller = [[QemuCocoaAppController alloc] init]; QemuCocoaAppController *controller = [[QemuCocoaAppController alloc] init];
[NSApp setDelegate:controller]; [NSApp setDelegate:controller];
@ -2077,6 +2066,21 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
left_command_key_enabled = 0; left_command_key_enabled = 0;
} }
if (opts->u.cocoa.has_zoom_to_fit && opts->u.cocoa.zoom_to_fit) {
stretch_video = true;
}
create_initial_menus();
/*
* Create the menu entries which depend on QEMU state (for consoles
* and removable devices). These make calls back into QEMU functions,
* which is OK because at this point we know that the second thread
* holds the iothread lock and is synchronously waiting for us to
* finish.
*/
add_console_menu_entries();
addRemovableDevicesMenuItems();
// register vga output callbacks // register vga output callbacks
register_displaychangelistener(&dcl); register_displaychangelistener(&dcl);