fix: adjust behavior of deleting active window in Moncole with Minimi…

…zeRest; ref #43, ref #55
Bismuth-Forge · Sep 28, 2021 · 86ae8a5 · 86ae8a5
1 parent d8dae35
commit 86ae8a5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/src/controller/index.ts b/src/controller/index.ts
@@ -29,7 +29,6 @@ export interface Controller {
    * A bunch of surfaces, that represent the user's screens.
    */
   readonly screens: DriverSurface[];
-  readonly currentScreen: number;
   /**
    * Current active window. In other words the window, that has focus.
    */
@@ -145,7 +144,6 @@ export interface Controller {
 export class TilingController implements Controller {
   private engine: Engine;
   private driver: DriverContext;
-  private screen: number;
   public constructor(
     qmlObjects: Bismuth.Qml.Main,
     kwinApi: KWin.Api,
@@ -154,7 +152,6 @@ export class TilingController implements Controller {
   ) {
     this.engine = new TilingEngine(this, config, debug);
     this.driver = new KWinDriver(qmlObjects, kwinApi, this, config, debug);
-    this.screen = 0;
   }
 
   /**
@@ -193,9 +190,6 @@ export class TilingController implements Controller {
     this.driver.currentSurface = value;
   }
 
-  public get currentScreen(){
-    return this.screen;
-  }
   public showNotification(text: string): void {
     this.driver.showNotification(text);
   }
@@ -242,17 +236,20 @@ export class TilingController implements Controller {
   public onWindowRemoved(window: Window): void {
     this.debug.debugObj(() => ["onWindowRemoved", { window }]);
     console.log(`Window remove: ${window}`);
-    const active = window === this.currentWindow;
-    this.screen = window.screen;
 
-    if (active && this.currentWindow && this.screen == this.currentWindow.screen
+    this.engine.unmanage(window);
+    this.engine.arrange();
+
+    // Switch to next window if monocle with config.monocleMinimizeRest
+    if (!this.currentWindow
       && this.engine.currentLayoutOnCurrentSurface() instanceof MonocleLayout
       && this.config.monocleMinimizeRest) {
       this.engine.focusOrder(1, true);
-      }
-
-    this.engine.unmanage(window);
-    this.engine.arrange();
+      // HACK: force window to maximize if it isn't already
+      this.engine.focusOrder(1, true);
+      this.engine.focusOrder(-1, true);
+      this.engine.arrange();
+    }
   }
 
   public onWindowMoveStart(_window: Window): void {
@@ -351,13 +348,13 @@ export class TilingController implements Controller {
   public onWindowFocused(window: Window): void {
     window.timestamp = new Date().getTime();
     this.currentWindow = window;
-    this.screen = window.screen;
+    // Minimize other windows if Moncole and config.monocleMinimizeRest
     if (this.engine.currentLayoutOnCurrentSurface() instanceof MonocleLayout
       && this.config.monocleMinimizeRest
       && this.engine.windows.getVisibleTiles(window.surface).includes(window)) {
       this.engine.currentLayoutOnCurrentSurface().apply(
         this,
-        this.engine.windows.getAllTileables(window.surface, this.screen),
+        this.engine.windows.getAllTileables(window.surface),
         window.surface.workingArea)
       this.engine.minimizeOthers(window);
     };

diff --git a/src/engine/index.ts b/src/engine/index.ts
@@ -354,8 +354,7 @@ export class TilingEngine implements Engine {
 
     if (includeHidden) {
       windows = this.windows.getAllWindows(
-        this.controller.currentSurface,
-        this.controller.currentScreen);
+        this.controller.currentSurface);
     } else {
       windows = this.windows.getVisibleWindows(this.controller.currentSurface);
     }
@@ -551,6 +550,8 @@ export class TilingEngine implements Engine {
     );
     if (layout) {
       this.controller.showNotification(layout.description);
+
+      // Minimize inactive windows if Monocle and config.monocleMinimizeRest
       if (this.currentLayoutOnCurrentSurface() instanceof MonocleLayout
         && this.config.monocleMinimizeRest && this.controller.currentWindow) {
         this.minimizeOthers(this.controller.currentWindow);
@@ -568,13 +569,19 @@ export class TilingEngine implements Engine {
     );
     if (layout) {
       this.controller.showNotification(layout.description);
+
+      // Minimize inactive windows if Monocle and config.monocleMinimizeRest
       if (this.currentLayoutOnCurrentSurface() instanceof MonocleLayout
         && this.config.monocleMinimizeRest && this.controller.currentWindow) {
         this.minimizeOthers(this.controller.currentWindow);
       }
     }
   }
 
+  /**
+   * Minimize all windows on the surface except the given window.
+   * Used mainly in Monocle mode with config.monocleMinimizeRest
+   */
   public minimizeOthers(window: Window): void {
     for (const tile of this.windows.getVisibleTiles(window.surface)) {
       if (tile.screen == window.screen && tile.id !== window.id

diff --git a/src/engine/window_store.ts b/src/engine/window_store.ts
@@ -98,16 +98,13 @@ export default class WindowStore {
   /**
    * Return all "tileable" windows on the given surface, including hidden
    */
-  public getAllTileables(srf: DriverSurface, screen: number): Window[] {
-    return this.list.filter((win) => win.tileable && win.screen === screen);
+  public getAllTileables(srf: DriverSurface): Window[] {
+    return this.list.filter((win) => win.tileable && win.surface.id === srf.id);
   }
 
   /** Return all windows on this surface, including minimized windows */
-  public getAllWindows(
-    srf: DriverSurface,
-    screen: number
-  ): Window[] {
-    return this.list.filter((win) => win.surface.id === srf.id && win.screen === screen);
+  public getAllWindows(srf: DriverSurface): Window[] {
+    return this.list.filter((win) => win.surface.id === srf.id);
   }
 
   //#endregion