From 4543c98de8556b92fdc5347dc0998434f5eef377 Mon Sep 17 00:00:00 2001 From: Lucas Oskorep Date: Wed, 30 Apr 2025 00:05:46 -0400 Subject: [PATCH] feat: adding fix for minimized windows still taking up space --- src/monitor.ts | 17 +++++++++++++++++ src/window.ts | 18 +++++++++++------- src/windowManager.ts | 38 ++++++++++++++++++++++++++++---------- 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/src/monitor.ts b/src/monitor.ts index 52a500b..751a270 100644 --- a/src/monitor.ts +++ b/src/monitor.ts @@ -1,15 +1,20 @@ import {WindowWrapper} from "./window.js"; import {Logger} from "./utils/logger.js"; import Mtk from "@girs/mtk-16"; +import Meta from "gi://Meta"; + export default class MonitorManager { _id: number; _windows: Map; + _minimized: Map; constructor(monitorId: number) { this._windows = new Map(); + this._minimized = new Map(); + this._id = monitorId; } @@ -28,6 +33,18 @@ export default class MonitorManager { this._tileWindows() } + minimizeWindow(winWrap: WindowWrapper): void { + this._windows.delete(winWrap.getWindowId()) + this._minimized.set(winWrap.getWindowId(), winWrap) + } + + unminimizeWindow(winWrap: WindowWrapper): void { + if (this._minimized.has(winWrap.getWindowId())) { + this._windows.set(winWrap.getWindowId(), winWrap); + this._minimized.delete(winWrap.getWindowId()); + } + } + removeAllWindows(): void { this._windows.clear() } diff --git a/src/window.ts b/src/window.ts index 52c92c7..6265660 100644 --- a/src/window.ts +++ b/src/window.ts @@ -9,13 +9,17 @@ export type Signal = { id: number; } +type WindowMinimizedHandler = (window: WindowWrapper) => void; + export class WindowWrapper { readonly _window: Meta.Window; + readonly _windowMinimizedHandler: WindowMinimizedHandler; readonly _signals: Signal[]; - constructor(window: Meta.Window) { + constructor(window: Meta.Window, winMinimized: WindowMinimizedHandler) { this._window = window; this._signals = []; + this._windowMinimizedHandler = winMinimized; } getWindow(): Meta.Window { @@ -88,13 +92,13 @@ export class WindowWrapper { // Remove window from managed windows temporarily // windowManager.removeFromTree(this._window); // If this was the active window, find a new one - windowManager.syncActiveWindow() // Retile remaining windows - windowManager._tileMonitors(); + windowManager.handleWindowMinimized(this); } else if (!this._window.minimized) { Logger.log(`Window unminimized: ${windowId}`); // windowManager.addWindow(this._window); + windowManager.handleWindowUnminimized(this); } }); @@ -138,12 +142,12 @@ export class WindowWrapper { Logger.log("WINDOW IS FULLSCREEN") this._window.unmake_fullscreen(); } - Logger.log("WINDOW", this._window.get_window_type(), this._window.allows_move()); - Logger.log("MONITOR INFO", getUsableMonitorSpace(this._window)); - Logger.log("NEW_SIZE", x, y, width, height); + // Logger.log("WINDOW", this._window.get_window_type(), this._window.allows_move()); + // Logger.log("MONITOR INFO", getUsableMonitorSpace(this._window)); + // Logger.log("NEW_SIZE", x, y, width, height); // win.move_resize_frame(false, 50, 50, 300, 300); this._window.move_resize_frame(false, x, y, width, height); - Logger.log("RESIZED WINDOW", this._window.get_frame_rect().height, this._window.get_frame_rect().width, this._window.get_frame_rect().x, this._window.get_frame_rect().y); + // Logger.log("RESIZED WINDOW", this._window.get_frame_rect().height, this._window.get_frame_rect().width, this._window.get_frame_rect().x, this._window.get_frame_rect().y); } safelyResizeWindow(x: number, y: number, width: number, height: number): void { diff --git a/src/windowManager.ts b/src/windowManager.ts index 750b8a5..9a590a8 100644 --- a/src/windowManager.ts +++ b/src/windowManager.ts @@ -14,9 +14,10 @@ export interface IWindowManager { // addWindow(window: Meta.Window): void; - handleWindowClosed(windowId: WindowWrapper): void; + handleWindowClosed(winWrap: WindowWrapper): void; + handleWindowMinimized(winWrap: WindowWrapper): void; + handleWindowUnminimized(winWrap: WindowWrapper): void; - _tileMonitors(): void; // removeFromTree(window: Meta.Window): void; syncActiveWindow(): number | null; @@ -104,12 +105,12 @@ export default class WindowManager implements IWindowManager { this._windowManagerSignals = [ - global.window_manager.connect("minimize", (_source, window) => { - Logger.log("MINIMIZING WINDOW") - }), - global.window_manager.connect("unminimize", (_source, window) => { - Logger.log("WINDOW UNMINIMIZED"); - }), + // global.window_manager.connect("minimize", (_source, window) => { + // Logger.log("MINIMIZING WINDOW") + // }), + // global.window_manager.connect("unminimize", (_source, window) => { + // Logger.log("WINDOW UNMINIMIZED"); + // }), global.window_manager.connect("show-tile-preview", (_, _metaWindow, _rect, _num) => { Logger.log("SHOW TITLE PREVIEW!") }), @@ -208,7 +209,7 @@ export default class WindowManager implements IWindowManager { } let wrapped = old_mon.getWindow(window.get_id()) if (wrapped === undefined) { - wrapped = new WindowWrapper(window) + wrapped = new WindowWrapper(window, this.handleWindowMinimized); } else { old_mon.removeWindow(window.get_id()) } @@ -217,6 +218,23 @@ export default class WindowManager implements IWindowManager { Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor()); } + public handleWindowMinimized(winWrap: WindowWrapper): void { + Logger.warn("WARNING MINIMIZING WINDOW"); + Logger.log("WARNING MINIMIZED", winWrap); + const monitor_id = winWrap.getWindow().get_monitor() + Logger.log("WARNING MINIMIZED", monitor_id); + Logger.warn("WARNING MINIMIZED", this._monitors); + this._monitors.get(monitor_id)?.minimizeWindow(winWrap); + this._tileMonitors() + } + + public handleWindowUnminimized(winWrap: WindowWrapper): void { + Logger.log("WINDOW UNMINIMIZED"); + const monitor_id = winWrap.getWindow().get_monitor() + this._monitors.get(monitor_id)?.unminimizeWindow(winWrap); + this._tileMonitors() + } + public captureExistingWindows() { Logger.log("CAPTURING WINDOWS") const workspace = global.workspace_manager.get_active_workspace(); @@ -263,7 +281,7 @@ export default class WindowManager implements IWindowManager { public addWindowToMonitor(window: Meta.Window) { - var wrapper = new WindowWrapper(window) + var wrapper = new WindowWrapper(window, this.handleWindowMinimized) wrapper.connectWindowSignals(this) this._monitors.get(window.get_monitor())?.addWindow(wrapper) }