Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1ea364c
Add gschema
leonardo-lemos May 30, 2025
762da1f
Implement MonitorLayoutManager
leonardo-lemos May 30, 2025
dd6c098
Use MonitorLayoutManager
leonardo-lemos May 30, 2025
b2c0ff1
Fix build
leonardo-lemos May 30, 2025
36dd686
Merge branch 'main' into introduce-layout-manager
leonardo-lemos May 30, 2025
441b280
Notify monitor number change only once
leonardo-lemos May 31, 2025
12a1a02
Show display label only once
leonardo-lemos May 31, 2025
f860515
Rescan Displays only if monitors changed
leonardo-lemos May 31, 2025
6712461
Add display transformation saving
leonardo-lemos May 31, 2025
756c165
Removed unused variable
leonardo-lemos Jun 1, 2025
26bcac8
Merge branch 'main' into introduce-layout-manager
zeebok Dec 4, 2025
756431b
Merge branch 'main' into introduce-layout-manager
jeremypw May 22, 2026
3690b20
Drop unnecessary check
jeremypw May 27, 2026
e43a21c
Reduce scope of some functions
jeremypw May 27, 2026
a9f5d71
Simplify arrange_monitors() & get_layout_key()
jeremypw May 27, 2026
c5071c6
Lose unused object
jeremypw May 27, 2026
0e85221
Inline simplified find_match_layout()
jeremypw May 27, 2026
a90c359
Drop hash for key
jeremypw May 27, 2026
4442fa3
Inline build_layout_variant()
jeremypw May 27, 2026
844dc04
Inline add_or_update_layout()
jeremypw May 27, 2026
11ebe2c
Simplify save layout using VariantDict
jeremypw May 27, 2026
5ee9993
Do not arrange unnecessarily in get_monitor_config()
jeremypw May 27, 2026
1b7cdc9
Merge branch 'main' into introduce-layout-manager
jeremypw May 27, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions data/display.gschema.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<schemalist>
<schema id="io.elementary.settings.display" path="/io/elementary/settings/display/">

<key name="preferred-display-layouts" type="a{sa{sa{sv}}}">
<default>{}</default>
<summary>Preferred display layouts</summary>
<description>
Stores user-defined display layout profiles.
Each profile contains a unique identifier and a list of monitors, with their respective position (x, y) and other properties such as transformation (e.g., rotation).
This allows the system to restore or suggest preferred monitor arrangements and settings when displays are connected or configurations change.
</description>
</key>

</schema>
</schemalist>
6 changes: 6 additions & 0 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ gresource = gnome.compile_resources(
'gresource',
'display.gresource.xml'
)

install_data(
'display.gschema.xml',
install_dir: datadir / 'glib-2.0' / 'schemas',
rename: 'io.elementary.settings.display.gschema.xml'
)
2 changes: 2 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ config_file = configure_file(
subdir('data')
subdir('src')
subdir('po')

gnome.post_install(glib_compile_schemas: true)
Comment thread
jeremypw marked this conversation as resolved.
101 changes: 101 additions & 0 deletions src/Objects/MonitorLayoutManager.vala
Comment thread
jeremypw marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* SPDX-License-Identifier: GPL-2.0-or-later
* SPDX-FileCopyrightText: 2025 elementary, Inc. <https://elementary.io>
*
* Authored by: Leonardo Lemos <leonardolemos@live.com>
*/

public class Display.MonitorLayoutManager : GLib.Object {
private Settings settings;

private const string PREFERRED_MONITOR_LAYOUTS_KEY = "preferred-display-layouts";

public MonitorLayoutManager () {
Object ();
}

construct {
settings = new Settings ("io.elementary.settings.display");
}

public void arrange_monitors (Gee.LinkedList<VirtualMonitor> virtual_monitors) {
if (virtual_monitors.size == 1) {
Comment thread
jeremypw marked this conversation as resolved.
// If there's only one monitor, no need to arrange
// Cloned monitors only have one virtual monitor so will return here
return;
}

var layout_key = get_layout_key (virtual_monitors);
// Layouts format are 'a{sa{sa{sv}}}'
var layouts = settings.get_value (PREFERRED_MONITOR_LAYOUTS_KEY);
VariantDict? monitors = null;
if (layouts == null &&
layouts.lookup (layout_key, "a{sa{sv}}", out monitors) &&
monitors != null) {

foreach (var virtual_monitor in virtual_monitors) {
DisplayTransform transform;
int x, y;
if (monitors.lookup (virtual_monitor.id, "(iiu)", out x, out y, out transform)) {
virtual_monitor.x = x;
virtual_monitor.y = y;
virtual_monitor.transform = transform;
}
}

return;
}

// If no layout found, we save the current layout to use later
save_layout (virtual_monitors);
}

public void save_layout (Gee.LinkedList<VirtualMonitor> virtual_monitors) {
//Build the layout variant
var dict_builder = new VariantDict ();
foreach (var monitor in virtual_monitors) {
var props_builder = new VariantDict ();
// We save three properties for now, may want to save more later
props_builder.insert ("x", "v", new Variant.int32 (monitor.x));
props_builder.insert ("y", "v", new Variant.int32 (monitor.y));
props_builder.insert ("transform", "v", new Variant.uint32 (monitor.transform));
var props_variant = props_builder.end ();
debug (props_variant.print (true));
dict_builder.insert_value (monitor.id, props_variant);
}

var layout_variant = dict_builder.end ();

// Add or update the layouts setting
var save_key = get_layout_key (virtual_monitors);
var layouts = settings.get_value (PREFERRED_MONITOR_LAYOUTS_KEY);
dict_builder = new VariantDict (layouts);
dict_builder.insert_value (save_key, layout_variant);

// Save to settings
settings.set_value (PREFERRED_MONITOR_LAYOUTS_KEY, dict_builder.end ());
}

private string get_layout_key (Gee.LinkedList<VirtualMonitor> virtual_monitors) {
// Generate a unique key based on the virtual monitors' monitors hashes
var key = new StringBuilder ();

foreach (var virtual_monitor in virtual_monitors) {
foreach (var monitor in virtual_monitor.monitors) {
key.append (virtual_monitor.id);
}
}

return key.str;
}

private bool is_virtual_monitors_cloned (Gee.LinkedList<VirtualMonitor> virtual_monitors) {
foreach (var monitor in virtual_monitors) {
if (monitor.x != 0 || monitor.y != 0) {
return false;
}
}

return true;
}
}
34 changes: 24 additions & 10 deletions src/Objects/MonitorManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ public class Display.MonitorManager : GLib.Object {
}
}

public signal void monitors_changed ();

private MutterDisplayConfigInterface iface;
private uint current_serial;
private MonitorLayoutManager layout_manager;

private static MonitorManager monitor_manager;
public static unowned MonitorManager get_default () {
Expand All @@ -65,9 +68,16 @@ public class Display.MonitorManager : GLib.Object {
construct {
monitors = new Gee.LinkedList<Display.Monitor> ();
virtual_monitors = new Gee.LinkedList<Display.VirtualMonitor> ();
layout_manager = new MonitorLayoutManager ();
try {
iface = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.Mutter.DisplayConfig", "/org/gnome/Mutter/DisplayConfig");
iface.monitors_changed.connect (get_monitor_config);
iface = Bus.get_proxy_sync (
BusType.SESSION,
"org.gnome.Mutter.DisplayConfig",
"/org/gnome/Mutter/DisplayConfig");
iface.monitors_changed.connect (() => {
get_monitor_config ();
monitors_changed ();
});
} catch (Error e) {
critical (e.message);
}
Expand All @@ -78,7 +88,10 @@ public class Display.MonitorManager : GLib.Object {
MutterReadLogicalMonitor[] mutter_logical_monitors;
GLib.HashTable<string, GLib.Variant> properties;
try {
iface.get_current_state (out current_serial, out mutter_monitors, out mutter_logical_monitors, out properties);
iface.get_current_state (out current_serial,
out mutter_monitors,
out mutter_logical_monitors,
out properties);
} catch (Error e) {
critical (e.message);
}
Expand Down Expand Up @@ -217,7 +230,7 @@ public class Display.MonitorManager : GLib.Object {
virtual_monitor.scale = mutter_logical_monitor.scale;
virtual_monitor.transform = mutter_logical_monitor.transform;
virtual_monitor.primary = mutter_logical_monitor.primary;
add_virtual_monitor (virtual_monitor);
virtual_monitors.add (virtual_monitor);
}

// Look for any monitors that aren't part of a virtual monitor (hence disabled)
Expand All @@ -237,9 +250,13 @@ public class Display.MonitorManager : GLib.Object {
virtual_monitor.primary = false;
virtual_monitor.monitors.add (monitor);
virtual_monitor.scale = virtual_monitors[0].scale;
add_virtual_monitor (virtual_monitor);
virtual_monitors.add (virtual_monitor);
}
}

if (!is_mirrored) {
layout_manager.save_layout (virtual_monitors);
}
}

public void set_monitor_config () throws Error {
Expand Down Expand Up @@ -402,13 +419,10 @@ public class Display.MonitorManager : GLib.Object {
virtual_monitors.clear ();
virtual_monitors.add_all (new_virtual_monitors);

notify_property ("virtual-monitor-number");
notify_property ("is-mirrored");
}
layout_manager.arrange_monitors (virtual_monitors);

private void add_virtual_monitor (Display.VirtualMonitor virtual_monitor) {
virtual_monitors.add (virtual_monitor);
notify_property ("virtual-monitor-number");
notify_property ("is-mirrored");
}

private VirtualMonitor? get_virtual_monitor_by_id (string id) {
Expand Down
5 changes: 1 addition & 4 deletions src/Widgets/DisplaysOverlay.vala
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public class Display.DisplaysOverlay : Gtk.Box {
add_output (virtual_monitor);
}

show_windows ();
change_active_displays_sensitivity ();
calculate_ratio ();
scanning = false;
Expand Down Expand Up @@ -350,10 +351,6 @@ public class Display.DisplaysOverlay : Gtk.Box {
check_configuration_change ();
calculate_ratio ();
});

if (!monitor_manager.is_mirrored && virtual_monitor.is_active) {
show_windows ();
}
}

private void set_as_primary (Display.VirtualMonitor new_primary) {
Expand Down
1 change: 1 addition & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ plug_files = files(
'Objects/MonitorMode.vala',
'Objects/MonitorManager.vala',
'Objects/Monitor.vala',
'Objects/MonitorLayoutManager.vala',
'Views/NightLightView.vala',
'Views/DisplaysView.vala',
'Views' / 'FiltersView.vala',
Expand Down