Handle inactive monitors better

src/Objects/MonitorLayoutManager.vala

@@ -31,34 +31,42 @@ public class Display.MonitorLayoutManager : GLib.Object {
         Variant? monitors = null;
         if (layouts != null) {
             monitors = layouts.lookup_value (layout_key, VariantType.VARDICT);
-            foreach (var virtual_monitor in virtual_monitors) {
-                Variant? props = monitors.lookup_value (virtual_monitor.id, VariantType.VARDICT);
-                if (props != null) {
-                    int32 x = 0, y = 0;
-                    uint32 t = 0;
-                    bool p = false, e = false;
-                    if (props.lookup ("x", "i", out x) &&
-                        props.lookup ("y", "i", out y) &&
-                        props.lookup ("transform", "u", out t) &&
-                        props.lookup ("primary", "b", out p) &&
-                        props.lookup ("enabled", "b", out e)) {
-
-                        virtual_monitor.x = x;
-                        virtual_monitor.y = y;
-                        virtual_monitor.transform = t;
-                        virtual_monitor.primary = p;
-                        virtual_monitor.is_active = e;
-                     } else {
-                         warning ("property setting missing for monitor %s", virtual_monitor.get_display_name ());
-                     }
-                } else {
-                    warning ("no property dictionary found for monitor.id %s", virtual_monitor.get_display_name ());
+            if (monitors != null) {
+                foreach (var virtual_monitor in virtual_monitors) {
+                    Variant? props = monitors.lookup_value (virtual_monitor.id, VariantType.VARDICT);
+                    if (props != null) {
+                        debug ("monitor %s props: %s", virtual_monitor.id, props.print (false));
+                        int32 x = 0, y = 0;
+                        uint32 t = 0;
+                        bool p = false, e = false;
+                        if (props.lookup ("x", "i", out x) &&
+                            props.lookup ("y", "i", out y) &&
+                            props.lookup ("transform", "u", out t) &&
+                            props.lookup ("primary", "b", out p) &&
+                            props.lookup ("enabled", "b", out e)
+                        ) {
+                            // Set transform first, since modifying it changes the transform selected value, which
+                            // triggers configuration and positions checks, mofifying x and y
+                            virtual_monitor.transform = t;
+                            virtual_monitor.x = x;
+                            virtual_monitor.y = y;
+                            virtual_monitor.primary = p;
+                            virtual_monitor.is_active = e;
+                        } else {
+                            warning ("no properties for monitor %s in a configuration that is supposed to include it",
+                                virtual_monitor.get_display_name ());
+                        }
+                    } else {
+                        warning ("no property dictionary found for monitor.id %s", virtual_monitor.get_display_name ());
+                    }
                 }
+            } else {
+                warning ("no configuration for the layout %s ", layout_key);
             }
 
             return;
         } else {
-            warning ("layout key %s not found", layout_key);
+            warning ("preferred layout key %s not found", PREFERRED_MONITOR_LAYOUTS_KEY);
         }
 
         // If no layout found, we save the current layout to use later
@@ -67,7 +75,6 @@ public class Display.MonitorLayoutManager : GLib.Object {
 
     public void save_layout (Gee.LinkedList<VirtualMonitor> virtual_monitors) {
         var save_key = get_layout_key (virtual_monitors);
-
         var monitor_dict = new VariantDict ();
         foreach (var monitor in virtual_monitors) {
             var props_dict = new VariantDict ();
@@ -89,19 +96,23 @@ public class Display.MonitorLayoutManager : GLib.Object {
         settings.set_value (PREFERRED_MONITOR_LAYOUTS_KEY, layouts_dict.end ());
     }
 
+    /**
+     * Generate a unique key based on the virtual monitors' monitors hashes
+     */
     private string get_layout_key (Gee.LinkedList<VirtualMonitor> virtual_monitors) {
-        // Generate a unique key based on the virtual monitors' monitors hashes
-        //NOTE The key depends on the order of the list which will change depending on whether monitors are
-        // active or not (and possibly on the order they were connected).
-        //TODO Consider whether a more controlled key is needed
+        var sorted_virtual_monitor_list = virtual_monitors;
+        sorted_virtual_monitor_list.sort ((vm1, vm2) => strcmp (vm1.id, vm2.id));
+
         var key = new StringBuilder ();
 
         foreach (var virtual_monitor in virtual_monitors) {
-            foreach (var monitor in virtual_monitor.monitors) {
+            if (virtual_monitor.is_active) {
+                key.append ("-");
                 key.append (virtual_monitor.id);
             }
         }
 
+        key.erase (0, 1);
         return key.str;
     }
 }

src/Objects/MonitorManager.vala

@@ -427,6 +427,10 @@ public class Display.MonitorManager : GLib.Object {
         notify_property ("is-mirrored");
     }
 
+    public void on_virtual_monitor_active_changed (VirtualMonitor vm) {
+        layout_manager.arrange_monitors (virtual_monitors);
+    }
+
     private VirtualMonitor? get_virtual_monitor_by_id (string id) {
         foreach (var vm in virtual_monitors) {
             if (vm.id == id) {

src/Widgets/DisplayWidget.vala

@@ -267,14 +267,18 @@ public class Display.DisplayWidget : Gtk.Box {
         display_label = new Gtk.Label (virtual_monitor_name) {
             halign = CENTER,
             valign = CENTER,
+            lines = 3,
+            ellipsize = END,
+            wrap = true,
+            wrap_mode = WORD,
             hexpand = true,
             vexpand = true
         };
 
         var grid = new Gtk.Grid ();
         grid.attach (primary_image, 0, 0);
         grid.attach (toggle_settings, 2, 0);
-        grid.attach (display_label, 0, 0, 3, 2);
+        grid.attach (display_label, 0, 1, 3, 1);
 
         append (grid);
 
@@ -291,12 +295,17 @@ public class Display.DisplayWidget : Gtk.Box {
 
             if (use_switch.active) {
                 remove_css_class ("disabled");
+                remove_css_class (Granite.STYLE_CLASS_DIM_LABEL);
+                remove_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
             } else {
                 add_css_class ("disabled");
+                add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
+                add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
             }
 
             configuration_changed ();
             active_changed ();
+            popover.popdown ();
         });
 
         if (!virtual_monitor.is_active) {