From 5e5fb4d0e9f3c6c0719aacd62e1ad4a90a4cf3b4 Mon Sep 17 00:00:00 2001
From: sanio <sanio@pickle.com>
Date: Thu, 10 Jul 2025 03:38:02 +0900
Subject: [PATCH] fix settings window show, hide, cancel-hide naming

---
 src/app/MainHeader.js                 | 38 ++++++--------
 src/electron/windowManager.js         | 73 ++++++++++++---------------
 src/features/settings/SettingsView.js |  4 +-
 3 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/src/app/MainHeader.js b/src/app/MainHeader.js
index e8b85b1..33c2a33 100644
--- a/src/app/MainHeader.js
+++ b/src/app/MainHeader.js
@@ -343,40 +343,32 @@ export class MainHeader extends LitElement {
         }
     }
 
-    showWindow(name, element) {
+    showSettingsWindow(element) {
         if (window.require) {
             const { ipcRenderer } = window.require('electron');
-            console.log(`[MainHeader] showWindow('${name}') called at ${Date.now()}`);
+            console.log(`[MainHeader] showSettingsWindow called at ${Date.now()}`);
             
-            ipcRenderer.send('cancel-hide-window', name);
+            ipcRenderer.send('cancel-hide-settings-window');
 
-            if (name === 'settings' && element) {
-                const rect = element.getBoundingClientRect();
-                ipcRenderer.send('show-window', {
-                    name: 'settings',
-                    bounds: {
-                        x: rect.left,
-                        y: rect.top,
-                        width: rect.width,
-                        height: rect.height
-                    }
+            if (element) {
+                const { left, top, width, height } = element.getBoundingClientRect();
+                ipcRenderer.send('show-settings-window', {
+                    x: left,
+                    y: top,
+                    width,
+                    height,
                 });
-            } else {
-                ipcRenderer.send('show-window', name);
             }
         }
     }
 
-    hideWindow(name) {
+    hideSettingsWindow() {
         if (window.require) {
-            console.log(`[MainHeader] hideWindow('${name}') called at ${Date.now()}`);
-            window.require('electron').ipcRenderer.send('hide-window', name);
+            console.log(`[MainHeader] hideSettingsWindow called at ${Date.now()}`);
+            window.require('electron').ipcRenderer.send('hide-settings-window');
         }
     }
 
-    cancelHideWindow(name) {
-
-    }
 
     renderShortcut(accelerator) {
         if (!accelerator) return html``;
@@ -449,8 +441,8 @@ export class MainHeader extends LitElement {
 
                 <button 
                     class="settings-button"
-                    @mouseenter=${(e) => this.showWindow('settings', e.currentTarget)}
-                    @mouseleave=${() => this.hideWindow('settings')}
+                    @mouseenter=${(e) => this.showSettingsWindow(e.currentTarget)}
+                    @mouseleave=${() => this.hideSettingsWindow()}
                 >
                     <div class="settings-icon">
                         <svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/src/electron/windowManager.js b/src/electron/windowManager.js
index 4100999..ec28dca 100644
--- a/src/electron/windowManager.js
+++ b/src/electron/windowManager.js
@@ -762,9 +762,9 @@ function setupIpcHandlers(movementManager) {
         }
     });
 
-    ipcMain.on('show-window', (event, args) => {
-        const { name, bounds } = typeof args === 'object' && args !== null ? args : { name: args, bounds: null };
-        const win = windowPool.get(name);
+    ipcMain.on('show-settings-window', (event, bounds) => {
+        if (!bounds) return;  
+        const win = windowPool.get('settings');
 
         if (win && !win.isDestroyed()) {
             if (settingsHideTimer) {
@@ -772,59 +772,50 @@ function setupIpcHandlers(movementManager) {
                 settingsHideTimer = null;
             }
 
-            if (name === 'settings') {
-                // Adjust position based on button bounds
-                const header = windowPool.get('header');
-                const headerBounds = header?.getBounds() ?? { x: 0, y: 0 };
-                const settingsBounds = win.getBounds();
+            // Adjust position based on button bounds
+            const header = windowPool.get('header');
+            const headerBounds = header?.getBounds() ?? { x: 0, y: 0 };
+            const settingsBounds = win.getBounds();
 
-                const disp = getCurrentDisplay(header);
-                const { x: waX, y: waY, width: waW, height: waH } = disp.workArea;
+            const disp = getCurrentDisplay(header);
+            const { x: waX, y: waY, width: waW, height: waH } = disp.workArea;
 
-                let x = Math.round(headerBounds.x + (bounds?.x ?? 0) + (bounds?.width ?? 0) / 2 - settingsBounds.width / 2);
-                let y = Math.round(headerBounds.y + (bounds?.y ?? 0) + (bounds?.height ?? 0) + 31);
+            let x = Math.round(headerBounds.x + (bounds?.x ?? 0) + (bounds?.width ?? 0) / 2 - settingsBounds.width / 2);
+            let y = Math.round(headerBounds.y + (bounds?.y ?? 0) + (bounds?.height ?? 0) + 31);
 
-                x = Math.max(waX + 10, Math.min(waX + waW - settingsBounds.width - 10, x));
-                y = Math.max(waY + 10, Math.min(waY + waH - settingsBounds.height - 10, y));
-
-                win.setBounds({ x, y });
-                win.__lockedByButton = true;
-                console.log(`[WindowManager] Positioning settings window at (${x}, ${y}) based on button bounds.`);
-            }
+            x = Math.max(waX + 10, Math.min(waX + waW - settingsBounds.width - 10, x));
+            y = Math.max(waY + 10, Math.min(waY + waH - settingsBounds.height - 10, y));
 
+            win.setBounds({ x, y });
+            win.__lockedByButton = true;
+            console.log(`[WindowManager] Positioning settings window at (${x}, ${y}) based on button bounds.`);
+            
             win.show();
             win.moveTop();
-
-            if (name === 'settings') {
-                win.setAlwaysOnTop(true);
-            }
-            // updateLayout();
+            win.setAlwaysOnTop(true);
         }
     });
 
-    ipcMain.on('hide-window', (event, name) => {
-        const window = windowPool.get(name);
+    ipcMain.on('hide-settings-window', (event) => {
+        const window = windowPool.get("settings");
         if (window && !window.isDestroyed()) {
-            if (name === 'settings') {
-                if (settingsHideTimer) {
-                    clearTimeout(settingsHideTimer);
-                }
-                settingsHideTimer = setTimeout(() => {
-                    if (window && !window.isDestroyed()) {
-                        window.setAlwaysOnTop(false);
-                        window.hide();
-                    }
-                    settingsHideTimer = null;
-                }, 200);
-            } else {
-                window.hide();
+            if (settingsHideTimer) {
+                clearTimeout(settingsHideTimer);
             }
+            settingsHideTimer = setTimeout(() => {
+                if (window && !window.isDestroyed()) {
+                    window.setAlwaysOnTop(false);
+                    window.hide();
+                }
+                settingsHideTimer = null;
+            }, 200);
+            
             window.__lockedByButton = false;
         }
     });
 
-    ipcMain.on('cancel-hide-window', (event, name) => {
-        if (name === 'settings' && settingsHideTimer) {
+    ipcMain.on('cancel-hide-settings-window', (event) => {
+        if (settingsHideTimer) {
             clearTimeout(settingsHideTimer);
             settingsHideTimer = null;
         }
diff --git a/src/features/settings/SettingsView.js b/src/features/settings/SettingsView.js
index d8b864c..c0b40ea 100644
--- a/src/features/settings/SettingsView.js
+++ b/src/features/settings/SettingsView.js
@@ -1025,14 +1025,14 @@ export class SettingsView extends LitElement {
     handleMouseEnter = () => {
         if (window.require) {
             const { ipcRenderer } = window.require('electron');
-            ipcRenderer.send('cancel-hide-window', 'settings');
+            ipcRenderer.send('cancel-hide-settings-window');
         }
     }
 
     handleMouseLeave = () => {
         if (window.require) {
             const { ipcRenderer } = window.require('electron');
-            ipcRenderer.send('hide-window', 'settings');
+            ipcRenderer.send('hide-settings-window');
         }
     }