Remove windowFocused copy (to avoid desync)

jadbox · Aug 13, 2019 · 04da9b0 · 04da9b0
1 parent 27f297f
commit 04da9b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/tilingManager/tilingLayouts/baseTiling.js b/tilingManager/tilingLayouts/baseTiling.js
@@ -12,7 +12,6 @@ var BaseTilingLayout = class BaseTilingLayout {
         );
         this.superWorkspace = superWorkspace;
         this.monitor = superWorkspace.monitor;
-        this.windowFocused = this.superWorkspace.windowFocused;
         this.windowChangedId = this.superWorkspace.connect(
             'windows-changed',
             this.onWindowsChanged.bind(this)
@@ -43,9 +42,7 @@ var BaseTilingLayout = class BaseTilingLayout {
         }
     }
 
-    onFocusChanged(windowFocused) {
-        this.windowFocused = windowFocused;
-    }
+    onFocusChanged() {}
 
     onTile() {
         log(`Tile ${this.superWorkspace.categoryKey}`);

diff --git a/tilingManager/tilingLayouts/maximize.js b/tilingManager/tilingLayouts/maximize.js
@@ -26,7 +26,6 @@ var MaximizeLayout = class MaximizeLayout extends BaseTilingLayout {
             const oldIndex = this.superWorkspace.windows.indexOf(
                 oldWindowFocused
             );
-            this.windowFocused = windowFocused;
             const direction = newIndex > oldIndex ? 1 : -1;
             this.prepareTransition(windowFocused, oldWindowFocused, direction);
             this.animateTransition(direction);
@@ -39,12 +38,13 @@ var MaximizeLayout = class MaximizeLayout extends BaseTilingLayout {
         }
         windows.forEach(window => {
             if (
-                window !== this.windowFocused ||
+                window !== this.superWorkspace.windowFocused ||
                 !this.superWorkspace.isDisplayed()
             ) {
                 window.get_compositor_private().hide();
             } else {
                 if (!window.grabbed && !window.maximized_horizontally) {
+                    Main.wm.skipNextEffect(window.get_compositor_private());
                     window.maximize(Meta.MaximizeFlags.BOTH);
                 }
                 window.get_compositor_private().show();
@@ -55,7 +55,7 @@ var MaximizeLayout = class MaximizeLayout extends BaseTilingLayout {
     onDestroy() {
         super.onDestroy();
         this.superWorkspace.windows.forEach(window => {
-            if (window !== this.windowFocused) {
+            if (window !== this.superWorkspace.windowFocused) {
                 window.get_compositor_private().show();
             }
         });

diff --git a/tilingManager/tilingLayouts/split.js b/tilingManager/tilingLayouts/split.js
@@ -27,7 +27,7 @@ var SplitLayout = class SplitLayout extends BaseGrabbableLayout {
         this.baseIndex = Math.max(
             0,
             Math.min(
-                regularWindows.indexOf(this.windowFocused),
+                regularWindows.indexOf(this.superWorkspace.windowFocused),
                 regularWindows.length - WINDOW_PER_SCREEN
             )
         );