lucasoskorep/aerospike-gnome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: adding fix for minimized windows still taking up space

Browse Source
This commit is contained in:
Lucas Oskorep
2025-04-30 00:05:46 -04:00
parent ed661b3fa6
commit 4543c98de8
3 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/monitor.ts
View File

@@ -1,15 +1,20 @@
import {WindowWrapper} from "./window.js"; import {WindowWrapper} from "./window.js";
import {Logger} from "./utils/logger.js"; import {Logger} from "./utils/logger.js";
import Mtk from "@girs/mtk-16"; import Mtk from "@girs/mtk-16";
import Meta from "gi://Meta";
export default class MonitorManager { export default class MonitorManager {
_id: number; _id: number;
_windows: Map<number, WindowWrapper>; _windows: Map<number, WindowWrapper>;
_minimized: Map<number, WindowWrapper>;
constructor(monitorId: number) { constructor(monitorId: number) {
this._windows = new Map<number, WindowWrapper>(); this._windows = new Map<number, WindowWrapper>();
this._minimized = new Map<number, WindowWrapper>();
this._id = monitorId; this._id = monitorId;
} }
@@ -28,6 +33,18 @@ export default class MonitorManager {
this._tileWindows() 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 { removeAllWindows(): void {
this._windows.clear() this._windows.clear()
} }

18
src/window.ts
View File

@@ -9,13 +9,17 @@ export type Signal = {
id: number; id: number;
} }
type WindowMinimizedHandler = (window: WindowWrapper) => void;
export class WindowWrapper { export class WindowWrapper {
readonly _window: Meta.Window; readonly _window: Meta.Window;
readonly _windowMinimizedHandler: WindowMinimizedHandler;
readonly _signals: Signal[]; readonly _signals: Signal[];
constructor(window: Meta.Window) { constructor(window: Meta.Window, winMinimized: WindowMinimizedHandler) {
this._window = window; this._window = window;
this._signals = []; this._signals = [];
this._windowMinimizedHandler = winMinimized;
} }
getWindow(): Meta.Window { getWindow(): Meta.Window {
@@ -88,13 +92,13 @@ export class WindowWrapper {
// Remove window from managed windows temporarily // Remove window from managed windows temporarily
// windowManager.removeFromTree(this._window); // windowManager.removeFromTree(this._window);
// If this was the active window, find a new one // If this was the active window, find a new one
windowManager.syncActiveWindow()
// Retile remaining windows // Retile remaining windows
windowManager._tileMonitors(); windowManager.handleWindowMinimized(this);
} else if (!this._window.minimized) { } else if (!this._window.minimized) {
Logger.log(`Window unminimized: ${windowId}`); Logger.log(`Window unminimized: ${windowId}`);
// windowManager.addWindow(this._window); // windowManager.addWindow(this._window);
windowManager.handleWindowUnminimized(this);
} }
}); });
@@ -138,12 +142,12 @@ export class WindowWrapper {
Logger.log("WINDOW IS FULLSCREEN") Logger.log("WINDOW IS FULLSCREEN")
this._window.unmake_fullscreen(); this._window.unmake_fullscreen();
} }
Logger.log("WINDOW", this._window.get_window_type(), this._window.allows_move()); // Logger.log("WINDOW", this._window.get_window_type(), this._window.allows_move());
Logger.log("MONITOR INFO", getUsableMonitorSpace(this._window)); // Logger.log("MONITOR INFO", getUsableMonitorSpace(this._window));
Logger.log("NEW_SIZE", x, y, width, height); // Logger.log("NEW_SIZE", x, y, width, height);
// win.move_resize_frame(false, 50, 50, 300, 300); // win.move_resize_frame(false, 50, 50, 300, 300);
this._window.move_resize_frame(false, x, y, width, height); 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 { safelyResizeWindow(x: number, y: number, width: number, height: number): void {

38
src/windowManager.ts
View File

@@ -14,9 +14,10 @@ export interface IWindowManager {
// addWindow(window: Meta.Window): void; // 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; // removeFromTree(window: Meta.Window): void;
syncActiveWindow(): number | null; syncActiveWindow(): number | null;
@@ -104,12 +105,12 @@ export default class WindowManager implements IWindowManager {
this._windowManagerSignals = [ this._windowManagerSignals = [
global.window_manager.connect("minimize", (_source, window) => { // global.window_manager.connect("minimize", (_source, window) => {
Logger.log("MINIMIZING WINDOW") // Logger.log("MINIMIZING WINDOW")
}), // }),
global.window_manager.connect("unminimize", (_source, window) => { // global.window_manager.connect("unminimize", (_source, window) => {
Logger.log("WINDOW UNMINIMIZED"); // Logger.log("WINDOW UNMINIMIZED");
}), // }),
global.window_manager.connect("show-tile-preview", (_, _metaWindow, _rect, _num) => { global.window_manager.connect("show-tile-preview", (_, _metaWindow, _rect, _num) => {
Logger.log("SHOW TITLE PREVIEW!") Logger.log("SHOW TITLE PREVIEW!")
}), }),
@@ -208,7 +209,7 @@ export default class WindowManager implements IWindowManager {
} }
let wrapped = old_mon.getWindow(window.get_id()) let wrapped = old_mon.getWindow(window.get_id())
if (wrapped === undefined) { if (wrapped === undefined) {
wrapped = new WindowWrapper(window) wrapped = new WindowWrapper(window, this.handleWindowMinimized);
} else { } else {
old_mon.removeWindow(window.get_id()) 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()); 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() { public captureExistingWindows() {
Logger.log("CAPTURING WINDOWS") Logger.log("CAPTURING WINDOWS")
const workspace = global.workspace_manager.get_active_workspace(); const workspace = global.workspace_manager.get_active_workspace();
@@ -263,7 +281,7 @@ export default class WindowManager implements IWindowManager {
public addWindowToMonitor(window: Meta.Window) { public addWindowToMonitor(window: Meta.Window) {
var wrapper = new WindowWrapper(window) var wrapper = new WindowWrapper(window, this.handleWindowMinimized)
wrapper.connectWindowSignals(this) wrapper.connectWindowSignals(this)
this._monitors.get(window.get_monitor())?.addWindow(wrapper) this._monitors.get(window.get_monitor())?.addWindow(wrapper)
} }