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

logical-monitor: Don't mirror physical dimensions

Browse Source 
Don't try to mirror the physical dimension, since that's a property of
one of the monitors, not of the logical monitor. Callers are changed to
deal with choosing the monitor to represent the logical monitor.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2016-12-13 22:06:43 +08:00
parent ff633f295e
commit 5d66a13397
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-logical-monitor.c
View File

@ -44,8 +44,6 @@ meta_logical_monitor_new (MetaMonitor *monitor,
main_output = meta_monitor_get_main_output (monitor); main_output = meta_monitor_get_main_output (monitor);
logical_monitor->number = number; logical_monitor->number = number;
logical_monitor->refresh_rate = main_output->crtc->current_mode->refresh_rate; logical_monitor->refresh_rate = main_output->crtc->current_mode->refresh_rate;
logical_monitor->width_mm = main_output->width_mm;
logical_monitor->height_mm = main_output->height_mm;
logical_monitor->winsys_id = main_output->winsys_id; logical_monitor->winsys_id = main_output->winsys_id;
logical_monitor->scale = main_output->scale; logical_monitor->scale = main_output->scale;
logical_monitor->in_fullscreen = -1; logical_monitor->in_fullscreen = -1;

2
src/backends/meta-logical-monitor.h
View File

@ -38,8 +38,6 @@ struct _MetaLogicalMonitor
MetaRectangle rect; MetaRectangle rect;
/* for tiled monitors these are calculated, from untiled just copied */ /* for tiled monitors these are calculated, from untiled just copied */
float refresh_rate; float refresh_rate;
int width_mm;
int height_mm;
gboolean is_primary; gboolean is_primary;
gboolean is_presentation; /* XXX: not yet used */ gboolean is_presentation; /* XXX: not yet used */
gboolean in_fullscreen; gboolean in_fullscreen;

4
src/wayland/meta-wayland-outputs.c
View File

@ -99,8 +99,8 @@ send_output_events (struct wl_resource *resource,
wl_output_send_geometry (resource, wl_output_send_geometry (resource,
logical_monitor->rect.x, logical_monitor->rect.x,
logical_monitor->rect.y, logical_monitor->rect.y,
logical_monitor->width_mm, output->width_mm,
logical_monitor->height_mm, output->height_mm,
output->subpixel_order, output->subpixel_order,
output->vendor, output->vendor,
output->product, output->product,