From 079b1254303aadde75746654804d537dd84c5db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 14 Feb 2017 18:31:05 +0800
Subject: [PATCH] DisplayConfig: Group logical monitor parameters a bit better

Move around the parameters, just to put the always-there fields before
the monitor array and property box.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
---
 src/backends/meta-monitor-manager.c    | 4 ++--
 src/org.gnome.Mutter.DisplayConfig.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 35a8822a4..6ba95f260 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -1204,7 +1204,7 @@ meta_monitor_manager_legacy_handle_apply_configuration  (MetaDBusDisplayConfig *
 #define MONITORS_FORMAT "a" MONITOR_FORMAT
 
 #define LOGICAL_MONITOR_MONITORS_FORMAT "a" MONITOR_SPEC_FORMAT
-#define LOGICAL_MONITOR_FORMAT "(ii" LOGICAL_MONITOR_MONITORS_FORMAT "dba{sv})"
+#define LOGICAL_MONITOR_FORMAT "(iidb" LOGICAL_MONITOR_MONITORS_FORMAT "a{sv})"
 #define LOGICAL_MONITORS_FORMAT "a" LOGICAL_MONITOR_FORMAT
 
 static gboolean
@@ -1313,9 +1313,9 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
                              LOGICAL_MONITOR_FORMAT,
                              logical_monitor->rect.x,
                              logical_monitor->rect.y,
-                             &logical_monitor_monitors_builder,
                              (double) logical_monitor->scale,
                              logical_monitor->is_primary,
+                             &logical_monitor_monitors_builder,
                              NULL);
     }
 
diff --git a/src/org.gnome.Mutter.DisplayConfig.xml b/src/org.gnome.Mutter.DisplayConfig.xml
index 92ee46071..60923a84c 100644
--- a/src/org.gnome.Mutter.DisplayConfig.xml
+++ b/src/org.gnome.Mutter.DisplayConfig.xml
@@ -328,13 +328,13 @@
 
 	* i x: x position
 	* i y: y position
+	* d scale: scale
+	* b primary: true if this is the primary logical monitor
 	* a(sss) monitors: monitors displaying this logical monitor
 	    * connector: name of the connector (e.g. DP-1, eDP-1 etc)
 	    * vendor: vendor name
 	    * product: product name
 	    * serial: product serial
-	* d scale: scale
-	* b primary: true if this is the primary logical monitor
 	* a{sv} properties: possibly other properties
 
 
@@ -354,7 +354,7 @@
     <method name="GetCurrentState">
       <arg name="serial" direction="out" type="u" />
       <arg name="monitors" direction="out" type="a((ssss)a(iiddu)a{sv})" />
-      <arg name="logical_monitors" direction="out" type="a(iia(ssss)dba{sv})" />
+      <arg name="logical_monitors" direction="out" type="a(iidba(ssss)a{sv})" />
       <arg name="supported_scales" direction="out" type="ad" />
       <arg name="max_screen_size" direction="out" type="(ii)" />
       <arg name="properties" direction="out" type="a{sv}" />