isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor-config-manager: Respect layout mode when calculating CRTC layout

Browse Source 
The scale used when calculating the CRTC layout should only come from
the logical monitor scale if the layout mode of the corresponding
configuration is 'logical'.

This fixes an issue where the X11 screen size accidentally got set to a
size scaled down by the configured global UI scale.

Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/1107
Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/1109

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1118
This commit is contained in:
Jonas Ådahl 2020-03-11 09:53:17 +01:00 committed by Florian Müllner
parent 509e9ca5a0
commit 531a195cf1
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backends/meta-monitor-config-manager.c
View File

@ -152,6 +152,7 @@ find_unassigned_crtc (MetaOutput *output,
typedef struct typedef struct
{ {
MetaMonitorManager *monitor_manager; MetaMonitorManager *monitor_manager;
MetaMonitorsConfig *config;
MetaLogicalMonitorConfig *logical_monitor_config; MetaLogicalMonitorConfig *logical_monitor_config;
MetaMonitorConfig *monitor_config; MetaMonitorConfig *monitor_config;
GPtrArray *crtc_infos; GPtrArray *crtc_infos;
@ -173,7 +174,7 @@ assign_monitor_crtc (MetaMonitor *monitor,
MetaMonitorTransform crtc_transform; MetaMonitorTransform crtc_transform;
int crtc_x, crtc_y; int crtc_x, crtc_y;
float x_offset, y_offset; float x_offset, y_offset;
float scale; float scale = 0.0;
float width, height; float width, height;
MetaCrtcMode *crtc_mode; MetaCrtcMode *crtc_mode;
graphene_rect_t crtc_layout; graphene_rect_t crtc_layout;
@ -209,7 +210,17 @@ assign_monitor_crtc (MetaMonitor *monitor,
x_offset = data->logical_monitor_config->layout.x; x_offset = data->logical_monitor_config->layout.x;
y_offset = data->logical_monitor_config->layout.y; y_offset = data->logical_monitor_config->layout.y;
scale = data->logical_monitor_config->scale;
switch (data->config->layout_mode)
{
case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
scale = data->logical_monitor_config->scale;
break;
case META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL:
scale = 1.0;
break;
}
crtc_mode = monitor_crtc_mode->crtc_mode; crtc_mode = monitor_crtc_mode->crtc_mode;
if (meta_monitor_transform_is_rotated (crtc_transform)) if (meta_monitor_transform_is_rotated (crtc_transform))
@ -272,6 +283,7 @@ assign_monitor_crtc (MetaMonitor *monitor,
static gboolean static gboolean
assign_monitor_crtcs (MetaMonitorManager *manager, assign_monitor_crtcs (MetaMonitorManager *manager,
MetaMonitorsConfig *config,
MetaLogicalMonitorConfig *logical_monitor_config, MetaLogicalMonitorConfig *logical_monitor_config,
MetaMonitorConfig *monitor_config, MetaMonitorConfig *monitor_config,
GPtrArray *crtc_infos, GPtrArray *crtc_infos,
@ -307,6 +319,7 @@ assign_monitor_crtcs (MetaMonitorManager *manager,
data = (MonitorAssignmentData) { data = (MonitorAssignmentData) {
.monitor_manager = manager, .monitor_manager = manager,
.config = config,
.logical_monitor_config = logical_monitor_config, .logical_monitor_config = logical_monitor_config,
.monitor_config = monitor_config, .monitor_config = monitor_config,
.crtc_infos = crtc_infos, .crtc_infos = crtc_infos,
@ -324,6 +337,7 @@ assign_monitor_crtcs (MetaMonitorManager *manager,
static gboolean static gboolean
assign_logical_monitor_crtcs (MetaMonitorManager *manager, assign_logical_monitor_crtcs (MetaMonitorManager *manager,
MetaMonitorsConfig *config,
MetaLogicalMonitorConfig *logical_monitor_config, MetaLogicalMonitorConfig *logical_monitor_config,
GPtrArray *crtc_infos, GPtrArray *crtc_infos,
GPtrArray *output_infos, GPtrArray *output_infos,
@ -337,6 +351,7 @@ assign_logical_monitor_crtcs (MetaMonitorManager *manager,
MetaMonitorConfig *monitor_config = l->data; MetaMonitorConfig *monitor_config = l->data;
if (!assign_monitor_crtcs (manager, if (!assign_monitor_crtcs (manager,
config,
logical_monitor_config, logical_monitor_config,
monitor_config, monitor_config,
crtc_infos, output_infos, crtc_infos, output_infos,
@ -395,7 +410,8 @@ meta_monitor_config_manager_assign (MetaMonitorManager *manager,
{ {
MetaLogicalMonitorConfig *logical_monitor_config = l->data; MetaLogicalMonitorConfig *logical_monitor_config = l->data;
if (!assign_logical_monitor_crtcs (manager, logical_monitor_config, if (!assign_logical_monitor_crtcs (manager,
config, logical_monitor_config,
crtc_infos, output_infos, crtc_infos, output_infos,
reserved_crtcs, error)) reserved_crtcs, error))
{ {