fix show workspace matrix in overview settings toggle

Author: ebeem

[email protected]/overview/controlsManagerLayout.js

@@ -50,20 +50,17 @@ var ControlsManagerLayout = class {
                 return workspaceBox;
             },
         }
-
-
-        this._overrideOriginalProperties();
     }
 
     destroy() {
-        this._restoreOriginalProperties();
+        this.restoreOriginalProperties();
     }
 
-    _overrideOriginalProperties() {
+    overrideOriginalProperties() {
         global.wsmatrix.GSFunctions['ControlsManagerLayout'] = Util.overrideProto(GOverviewControls.ControlsManagerLayout.prototype, this._overrideProperties);
     }
 
-    _restoreOriginalProperties() {
+    restoreOriginalProperties() {
         Util.overrideProto(GOverviewControls.ControlsManagerLayout.prototype, global.wsmatrix.GSFunctions['ControlsManagerLayout']);
     }
 }

[email protected]/overview/overviewManager.js

@@ -9,17 +9,50 @@ var OverviewManager = class {
     constructor(settings, keybindins) {
         this._settings = settings;
         this._keybindins = keybindins;
-        this._overrideProperties = {};
+
         this._thumbnailsBoxOverride = new ThumbnailsBox.ThumbnailsBox(this._settings, this._keybindins);
         this._workspacesViewOverride = new WorkspacesView.WorkspacesView(this._settings, this._keybindins);
         this._controlsManagerLayoutOverride = new ControlsManagerLayout.ControlsManagerLayout(this._settings, this._keybindins);
         this._secondaryMonitorDisplayOverride = new SecondaryMonitorDisplay.SecondaryMonitorDisplay(this._settings, this._keybindins);
+
+        this._handleShowOverviewGridChanged();
+        this._connectSettings();
+    }
+
+    _connectSettings() {
+        this.settingsHandlerShowOverviewGrid = this._settings.connect(
+            'changed::show-overview-grid',
+            this._handleShowOverviewGridChanged.bind(this)
+        );
+    }
+
+    _disconnectSettings() {
+        this._settings.disconnect(this.settingsHandlerShowOverviewGrid);
+    }
+
+    _handleShowOverviewGridChanged() {
+        this.showOvervieGrid = this._settings.get_boolean('show-overview-grid');
+        if (this.showOvervieGrid)
+            this.override();
+        else
+            this.restore();
+    }
+
+    override() {
+        this._thumbnailsBoxOverride.overrideOriginalProperties();
+        this._workspacesViewOverride.overrideOriginalProperties();
+        this._controlsManagerLayoutOverride.overrideOriginalProperties();
+        this._secondaryMonitorDisplayOverride.overrideOriginalProperties();
+    }
+
+    restore() {
+        this._thumbnailsBoxOverride.restoreOriginalProperties();
+        this._workspacesViewOverride.restoreOriginalProperties();
+        this._controlsManagerLayoutOverride.restoreOriginalProperties();
+        this._secondaryMonitorDisplayOverride.restoreOriginalProperties();
     }
 
     destroy() {
-        this._thumbnailsBoxOverride.destroy();
-        this._workspacesViewOverride.destroy();
-        this._controlsManagerLayoutOverride.destroy();
-        this._secondaryMonitorDisplayOverride.destroy();
+        this._disconnectSettings();
     }
 }

[email protected]/overview/secondaryMonitorDisplay.js

@@ -43,20 +43,17 @@ var SecondaryMonitorDisplay = class {
                 return workspaceBox;
             },
         }
-
-
-        this._overrideOriginalProperties();
     }
 
     destroy() {
-        this._restoreOriginalProperties();
+        this.restoreOriginalProperties();
     }
 
-    _overrideOriginalProperties() {
+    overrideOriginalProperties() {
         global.wsmatrix.GSFunctions['SecondaryMonitorDisplay'] = Util.overrideProto(GWorkspacesView.SecondaryMonitorDisplay.prototype, this._overrideProperties);
     }
 
-    _restoreOriginalProperties() {
+    restoreOriginalProperties() {
         Util.overrideProto(GWorkspacesView.SecondaryMonitorDisplay.prototype, global.wsmatrix.GSFunctions['SecondaryMonitorDisplay']);
     }
 }

[email protected]/overview/thumbnailsBox.js

@@ -338,19 +338,17 @@ var ThumbnailsBox = class {
                 return workspaceBox;
             },
         }
-
-        this._overrideOriginalProperties();
     }
 
     destroy() {
-        this._restoreOriginalProperties();
+        this.restoreOriginalProperties();
     }
 
-    _overrideOriginalProperties() {
+    overrideOriginalProperties() {
         global.wsmatrix.GSFunctions['ThumbnailsBox'] = Util.overrideProto(GWorkspaceThumbnail.ThumbnailsBox.prototype, this._overrideProperties);
     }
 
-    _restoreOriginalProperties() {
+    restoreOriginalProperties() {
         Util.overrideProto(GWorkspaceThumbnail.ThumbnailsBox.prototype, global.wsmatrix.GSFunctions['ThumbnailsBox']);
     }
 }

[email protected]/overview/workspacesView.js

@@ -119,19 +119,17 @@ var WorkspacesView = class {
                 });
             },
         }
-
-        this._overrideOriginalProperties();
     }
 
     destroy() {
-        this._restoreOriginalProperties();
+        this.restoreOriginalProperties();
     }
 
-    _overrideOriginalProperties() {
+    overrideOriginalProperties() {
         global.wsmatrix.GSFunctions['WorkspacesView'] = Util.overrideProto(GWorkspacesView.WorkspacesView.prototype, this._overrideProperties);
     }
 
-    _restoreOriginalProperties() {
+    restoreOriginalProperties() {
         Util.overrideProto(GWorkspacesView.WorkspacesView.prototype, global.wsmatrix.GSFunctions['WorkspacesView']);
     }
 }