changes changes etc

zeroxoneafour · Apr 19, 2024 · 59f2324 · 59f2324
1 parent 83084c9
commit 59f2324
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/readme.md b/readme.md
@@ -21,7 +21,7 @@ The descendant of [autotile](https://github.com/zeroxoneafour/kwin-autotile).
 
 ## features
 
--   Works in Wayland Plasma 6.0 and up (needs KWin 6.0.3 installed to drag tiles with the mouse)
+-   Works in Wayland Plasma 6.0.4 and up
 -   Custom moddable tiling engine backend
 -   Edit tile sizes with the integrated KWin GUI
 -   Move and tile windows with your mouse and keyboard

diff --git a/src/controller/actions/windowhooks.ts b/src/controller/actions/windowhooks.ts
@@ -204,7 +204,9 @@ export class WindowHooks {
         } else if (
             !this.window.fullScreen &&
             this.extensions.wasTiled &&
-            !this.extensions.isTiled
+            !this.extensions.isTiled &&
+            !this.window.minimized &&
+            !(this.extensions.maximized && this.extensions.isSingleMaximized)
         ) {
             this.putWindowInBestTile();
         }
@@ -225,7 +227,9 @@ export class WindowHooks {
         } else if (
             !this.window.minimized &&
             this.extensions.wasTiled &&
-            !this.extensions.isTiled
+            !this.extensions.isTiled &&
+            !this.window.fullScreen &&
+            !(this.extensions.maximized && this.extensions.isSingleMaximized)
         ) {
             this.putWindowInBestTile();
         }
@@ -257,7 +261,9 @@ export class WindowHooks {
         } else if (
             !maximized &&
             this.extensions.wasTiled &&
-            !this.extensions.isTiled
+            !this.extensions.isTiled &&
+            !this.window.fullScreen &&
+            !this.window.minimized
         ) {
             this.putWindowInBestTile();
         }

diff --git a/src/driver/index.ts b/src/driver/index.ts
@@ -214,19 +214,27 @@ export class DriverManager {
             );
             // make registered "untiled" clients appear untiled
             for (const window of driver.untiledWindows) {
+                const extensions = this.ctrl.windowExtensions.get(window)!;
+                // shouldve already done this if isTiled is already false?
+                if (!extensions.isTiled) {
+                    continue;
+                }
                 // sometimes effects on untiled windows dont properly apply
-                if (window.fullScreen) {
+                let fullscreen: boolean = false;
+                if (window.fullScreen && extensions.isTiled) {
                     window.fullScreen = false;
-                    window.fullScreen = true;
+                    fullscreen = true;
                 }
                 // maxmimized
-                const extensions = this.ctrl.windowExtensions.get(window)!;
                 const wasSingleMaximized = extensions.isSingleMaximized;
                 this.applyUntiled(window);
                 window.tile = null;
                 if (wasSingleMaximized) {
                     window.setMaximize(false, false);
                 }
+                if (fullscreen) {
+                    window.fullScreen = true;
+                }
             }
         }
         this.buildingLayout = false;