brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: Use transform helper when dealing with panel orientation

Browse Source 
Replace the open coded monitor transform math with the new helper.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1064
This commit is contained in:
Jonas Ådahl 2020-02-18 11:30:38 +01:00
parent e6913d1471
commit 92f0eb9d14
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/meta-monitor.c
View File

@ -467,15 +467,12 @@ meta_monitor_crtc_to_logical_transform (MetaMonitor *monitor,
MetaMonitorTransform transform) MetaMonitorTransform transform)
{ {
MetaOutput *output = meta_monitor_get_main_output (monitor); MetaOutput *output = meta_monitor_get_main_output (monitor);
MetaMonitorTransform new_transform; MetaMonitorTransform inverted_paniel_orientation_transform;
new_transform = (transform + META_MONITOR_TRANSFORM_FLIPPED - inverted_paniel_orientation_transform =
output->panel_orientation_transform) % meta_monitor_transform_invert (output->panel_orientation_transform);
META_MONITOR_TRANSFORM_FLIPPED; return meta_monitor_transform_transform (transform,
if (meta_monitor_transform_is_flipped (transform)) inverted_paniel_orientation_transform);
new_transform += META_MONITOR_TRANSFORM_FLIPPED;
return new_transform;
} }
static void static void

11
src/backends/meta-output.c
View File

@ -66,14 +66,11 @@ MetaMonitorTransform
meta_output_logical_to_crtc_transform (MetaOutput *output, meta_output_logical_to_crtc_transform (MetaOutput *output,
MetaMonitorTransform transform) MetaMonitorTransform transform)
{ {
MetaMonitorTransform new_transform; MetaMonitorTransform panel_orientation_transform;
new_transform = (transform + output->panel_orientation_transform) % panel_orientation_transform = output->panel_orientation_transform;
META_MONITOR_TRANSFORM_FLIPPED; return meta_monitor_transform_transform (transform,
if (meta_monitor_transform_is_flipped (transform)) panel_orientation_transform);
new_transform += META_MONITOR_TRANSFORM_FLIPPED;
return new_transform;
} }
static void static void