summaryrefslogtreecommitdiff
path: root/src/backends/meta-monitor-config-manager.c
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2017-03-17 17:21:10 +0800
committerJonas Ådahl <jadahl@gmail.com>2017-04-07 22:30:49 +0800
commitafcc1bf512c96b9d39d0db000f77728b6dab9bdd (patch)
tree8ced718ab89beb55d465bc05e1da66f18f5ec350 /src/backends/meta-monitor-config-manager.c
parent8a29c51b7359701a1b70ee0562f85fe0b85bb8a7 (diff)
downloadmutter-afcc1bf512c96b9d39d0db000f77728b6dab9bdd.tar.gz
monitor: Don't keep CRTC position in MetaMonitorCrtcMode
The CRTC position depends on the transform and how the transform is implemented. The function calculating the positions still doesn't support anything but the non-transformed case; this commit is in preparation of adding support for transforms. https://bugzilla.gnome.org/show_bug.cgi?id=777732
Diffstat (limited to 'src/backends/meta-monitor-config-manager.c')
-rw-r--r--src/backends/meta-monitor-config-manager.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index 71652962a..bd65625c0 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -117,6 +117,7 @@ assign_monitor_crtc (MetaMonitor *monitor,
MonitorAssignmentData *data = user_data;
MetaOutput *output;
MetaCrtc *crtc;
+ int crtc_x, crtc_y;
MetaCrtcInfo *crtc_info;
MetaOutputInfo *output_info;
MetaMonitorConfig *first_monitor_config;
@@ -136,12 +137,15 @@ assign_monitor_crtc (MetaMonitor *monitor,
return FALSE;
}
+ meta_monitor_calculate_crtc_pos (monitor, mode, output,
+ &crtc_x, &crtc_y);
+
crtc_info = g_slice_new0 (MetaCrtcInfo);
*crtc_info = (MetaCrtcInfo) {
.crtc = crtc,
.mode = monitor_crtc_mode->crtc_mode,
- .x = monitor_crtc_mode->x,
- .y = monitor_crtc_mode->y,
+ .x = crtc_x,
+ .y = crtc_y,
.transform = META_MONITOR_TRANSFORM_NORMAL,
.outputs = g_ptr_array_new ()
};