[mutter] logical-monitor: Don't mirror physical dimensions
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] logical-monitor: Don't mirror physical dimensions
- Date: Wed, 25 Jan 2017 08:35:04 +0000 (UTC)
commit 5d66a13397c58b035c799a5db3d97c8132340985
Author: Jonas Ådahl <jadahl gmail com>
Date: Tue Dec 13 22:06:43 2016 +0800
logical-monitor: Don't mirror physical dimensions
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
src/backends/meta-logical-monitor.c | 2 --
src/backends/meta-logical-monitor.h | 2 --
src/wayland/meta-wayland-outputs.c | 4 ++--
3 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/backends/meta-logical-monitor.c b/src/backends/meta-logical-monitor.c
index 054a2ff..96588c4 100644
--- a/src/backends/meta-logical-monitor.c
+++ b/src/backends/meta-logical-monitor.c
@@ -44,8 +44,6 @@ meta_logical_monitor_new (MetaMonitor *monitor,
main_output = meta_monitor_get_main_output (monitor);
logical_monitor->number = number;
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->scale = main_output->scale;
logical_monitor->in_fullscreen = -1;
diff --git a/src/backends/meta-logical-monitor.h b/src/backends/meta-logical-monitor.h
index fb66021..bce0822 100644
--- a/src/backends/meta-logical-monitor.h
+++ b/src/backends/meta-logical-monitor.h
@@ -38,8 +38,6 @@ struct _MetaLogicalMonitor
MetaRectangle rect;
/* for tiled monitors these are calculated, from untiled just copied */
float refresh_rate;
- int width_mm;
- int height_mm;
gboolean is_primary;
gboolean is_presentation; /* XXX: not yet used */
gboolean in_fullscreen;
diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c
index eef843f..66bc108 100644
--- a/src/wayland/meta-wayland-outputs.c
+++ b/src/wayland/meta-wayland-outputs.c
@@ -99,8 +99,8 @@ send_output_events (struct wl_resource *resource,
wl_output_send_geometry (resource,
logical_monitor->rect.x,
logical_monitor->rect.y,
- logical_monitor->width_mm,
- logical_monitor->height_mm,
+ output->width_mm,
+ output->height_mm,
output->subpixel_order,
output->vendor,
output->product,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]