fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui/gtk: Add keep-aspect-ratio option

Browse source 
When aspect ratio of host window and that of guest display are not
aligned, we can either zoom the guest content to fill the whole host
window or add padding to respect aspect ratio of the guest. Add an
option keep-aspect-ratio to allow users to select their preferred
behavior in this case.

Suggested-by: BALATON Zoltan <balaton@eik.bme.hu>
Suggested-by: Kim, Dongwon <dongwon.kim@intel.com>
Signed-off-by: Weifeng Liu <weifeng.liu.z@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20250601045245.36778-2-weifeng.liu.z@gmail.com>
This commit is contained in:
Weifeng Liu 2025-06-01 12:52:32 +08:00 • committed by Marc-André Lureau
parent 454f4b0f59
commit c65680a76c
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/ui/gtk.h
View file

@ -140,6 +140,7 @@ struct GtkDisplayState {
GdkCursor *null_cursor;
Notifier mouse_mode_notifier;
gboolean free_scale;
gboolean keep_aspect_ratio;
bool external_pause_update;

12
qapi/ui.json
View file

@ -1335,13 +1335,17 @@
# @show-menubar: Display the main window menubar. Defaults to "on".
# (Since 8.0)
#
# @keep-aspect-ratio: Keep width/height aspect ratio of guest content when
# resizing host window. Defaults to "on". (Since 10.1)
#
# Since: 2.12
##
{ 'struct' : 'DisplayGTK',
'data' : { '*grab-on-hover' : 'bool',
'*zoom-to-fit' : 'bool',
'*show-tabs' : 'bool',
'*show-menubar' : 'bool' } }
'data' : { '*grab-on-hover' : 'bool',
'*zoom-to-fit' : 'bool',
'*show-tabs' : 'bool',
'*show-menubar' : 'bool',
'*keep-aspect-ratio' : 'bool' } }
##
# @DisplayEGLHeadless:

12
ui/gtk.c
View file

@ -828,8 +828,12 @@ void gd_update_scale(VirtualConsole *vc, int ww, int wh, int fbw, int fbh)
sx = (double)ww / fbw;
sy = (double)wh / fbh;
vc->gfx.scale_x = vc->gfx.scale_y = MIN(sx, sy);
if (vc->s->keep_aspect_ratio) {
vc->gfx.scale_x = vc->gfx.scale_y = MIN(sx, sy);
} else {
vc->gfx.scale_x = sx;
vc->gfx.scale_y = sy;
}
}
}
/**
@ -2328,6 +2332,10 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
s->free_scale = true;
}
s->keep_aspect_ratio = true;
if (s->opts->u.gtk.has_keep_aspect_ratio)
s->keep_aspect_ratio = s->opts->u.gtk.keep_aspect_ratio;
for (i = 0; i < INPUT_EVENT_SLOTS_MAX; i++) {
struct touch_slot *slot = &touch_slots[i];
slot->tracking_id = -1;