isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

DisplayConfig: Group logical monitor parameters a bit better

Browse Source 
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
This commit is contained in:
Jonas Ådahl 2017-02-14 18:31:05 +08:00
parent 770a5a5bff
commit 079b125430
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/meta-monitor-manager.c
View File

@ -1204,7 +1204,7 @@ meta_monitor_manager_legacy_handle_apply_configuration (MetaDBusDisplayConfig *
#define MONITORS_FORMAT "a" MONITOR_FORMAT #define MONITORS_FORMAT "a" MONITOR_FORMAT
#define LOGICAL_MONITOR_MONITORS_FORMAT "a" MONITOR_SPEC_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 #define LOGICAL_MONITORS_FORMAT "a" LOGICAL_MONITOR_FORMAT
static gboolean static gboolean
@ -1313,9 +1313,9 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
LOGICAL_MONITOR_FORMAT, LOGICAL_MONITOR_FORMAT,
logical_monitor->rect.x, logical_monitor->rect.x,
logical_monitor->rect.y, logical_monitor->rect.y,
&logical_monitor_monitors_builder,
(double) logical_monitor->scale, (double) logical_monitor->scale,
logical_monitor->is_primary, logical_monitor->is_primary,
&logical_monitor_monitors_builder,
NULL); NULL);
} }

6
src/org.gnome.Mutter.DisplayConfig.xml
View File

@ -328,13 +328,13 @@
* i x: x position * i x: x position
* i y: y 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 * a(sss) monitors: monitors displaying this logical monitor
* connector: name of the connector (e.g. DP-1, eDP-1 etc) * connector: name of the connector (e.g. DP-1, eDP-1 etc)
* vendor: vendor name * vendor: vendor name
* product: product name * product: product name
* serial: product serial * serial: product serial
* d scale: scale
* b primary: true if this is the primary logical monitor
* a{sv} properties: possibly other properties * a{sv} properties: possibly other properties
@ -354,7 +354,7 @@
<method name="GetCurrentState"> <method name="GetCurrentState">
<arg name="serial" direction="out" type="u" /> <arg name="serial" direction="out" type="u" />
<arg name="monitors" direction="out" type="a((ssss)a(iiddu)a{sv})" /> <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="supported_scales" direction="out" type="ad" />
<arg name="max_screen_size" direction="out" type="(ii)" /> <arg name="max_screen_size" direction="out" type="(ii)" />
<arg name="properties" direction="out" type="a{sv}" /> <arg name="properties" direction="out" type="a{sv}" />