Merge branch 'wl-phys-transform-3-24' into 'gtk-3-24'

gdk/wayland: Take transform into account when setting physical size

See merge request GNOME/gtk!3517
This commit is contained in:
Matthias Clasen 2021-05-05 18:38:34 +00:00
commit 0fc99afa25

View File

@ -1638,7 +1638,21 @@ output_handle_geometry (void *data,
monitor->x = x; monitor->x = x;
monitor->y = y; monitor->y = y;
gdk_monitor_set_physical_size (GDK_MONITOR (monitor), physical_width, physical_height);
switch (transform)
{
case WL_OUTPUT_TRANSFORM_90:
case WL_OUTPUT_TRANSFORM_270:
case WL_OUTPUT_TRANSFORM_FLIPPED_90:
case WL_OUTPUT_TRANSFORM_FLIPPED_270:
gdk_monitor_set_physical_size (GDK_MONITOR (monitor),
physical_height, physical_width);
break;
default:
gdk_monitor_set_physical_size (GDK_MONITOR (monitor),
physical_width, physical_height);
}
gdk_monitor_set_subpixel_layout (GDK_MONITOR (monitor), subpixel); gdk_monitor_set_subpixel_layout (GDK_MONITOR (monitor), subpixel);
gdk_monitor_set_manufacturer (GDK_MONITOR (monitor), make); gdk_monitor_set_manufacturer (GDK_MONITOR (monitor), make);
gdk_monitor_set_model (GDK_MONITOR (monitor), model); gdk_monitor_set_model (GDK_MONITOR (monitor), model);