feat!: change move to a dialog and allow resizing (#5)

Author: amrbashir

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+### Changed
+
+- The `Move` context menu item has been renamed to `Move & Resize`
+
+### Added
+
+- Added `Move & Resize` to the tray icon menu.
+- The new `Move & Resize` will open a dialog that allows fine editing of the position and size values for the switcher.
+
 ## [0.5.0] - 2025-03-25
 
 ### Added

src/app.rs

@@ -7,12 +7,21 @@ use winit::event_loop::{ActiveEventLoop, EventLoopProxy};
 use winit::window::WindowId;
 
 use crate::egui_glue::EguiWindow;
+use crate::window_registry_info::WindowRegistryInfo;
 
+#[derive(Debug, Clone)]
 pub enum AppMessage {
     UpdateWorkspaces(Vec<crate::komorebi::Workspace>),
     MenuEvent(muda::MenuEvent),
     SystemSettingsChanged,
     DpiChanged,
+    StartMoveResize,
+    CreateResizeWindow {
+        host: isize,
+        info: WindowRegistryInfo,
+    },
+    CloseWindow(WindowId),
+    NotifyWindowInfoChanges(WindowRegistryInfo),
 }
 
 pub struct App {
@@ -24,21 +33,41 @@ pub struct App {
 }
 
 impl App {
-    pub fn new(taskbar_hwnd: HWND, proxy: EventLoopProxy<AppMessage>) -> Self {
+    pub fn new(taskbar_hwnd: HWND, proxy: EventLoopProxy<AppMessage>) -> anyhow::Result<Self> {
         let wgpu_instance = egui_wgpu::wgpu::Instance::new(&wgpu::InstanceDescriptor {
             backends: wgpu::Backends::DX12,
             ..Default::default()
         });
 
-        let tray_icon = crate::tray_icon::TrayIcon::new().ok();
+        let tray_icon = crate::tray_icon::TrayIcon::new(proxy.clone()).ok();
 
-        Self {
+        Ok(Self {
             wgpu_instance,
             taskbar_hwnd,
             windows: Default::default(),
             proxy,
             tray_icon,
+        })
+    }
+
+    fn handle_app_message(
+        &mut self,
+        event_loop: &ActiveEventLoop,
+        event: &AppMessage,
+    ) -> anyhow::Result<()> {
+        match event {
+            AppMessage::CreateResizeWindow { host, info } => {
+                self.create_resize_window(event_loop, HWND(*host as _), *info)?
+            }
+
+            AppMessage::CloseWindow(window_id) => {
+                self.windows.remove(window_id);
+            }
+
+            _ => {}
         }
+
+        Ok(())
     }
 }
 
@@ -55,14 +84,20 @@ impl ApplicationHandler<AppMessage> for App {
     fn resumed(&mut self, _event_loop: &ActiveEventLoop) {}
 
     fn user_event(&mut self, event_loop: &ActiveEventLoop, event: AppMessage) {
+        if let Err(e) = self.handle_app_message(event_loop, &event) {
+            tracing::error!("Error while handling AppMessage: {e}")
+        }
+
         if let Some(tray) = &self.tray_icon {
-            tray.handle_app_message(event_loop, &event);
+            if let Err(e) = tray.handle_app_message(event_loop, &event) {
+                tracing::error!("Error while handling AppMessage for tray: {e}")
+            }
         }
 
         for window in self.windows.values_mut() {
             let ctx = window.surface.egui_renderer.egui_ctx();
             if let Err(e) = window.view.handle_app_message(ctx, event_loop, &event) {
-                tracing::error!("Error while handling AppMessage: {e}")
+                tracing::error!("Error while handling AppMessage for window: {e}")
             }
 
             window.request_redraw();
@@ -76,10 +111,13 @@ impl ApplicationHandler<AppMessage> for App {
         event: WindowEvent,
     ) {
         if event == WindowEvent::CloseRequested {
-            tracing::info!("Closing main window");
+            tracing::info!("Closing window {window_id:?}");
             self.windows.remove(&window_id);
-            tracing::info!("Exiting event loop");
-            event_loop.exit();
+
+            if self.windows.is_empty() {
+                tracing::info!("Exiting event loop");
+                event_loop.exit();
+            }
         }
 
         let Some(window) = self.windows.get_mut(&window_id) else {

src/host.rs

@@ -2,27 +2,76 @@ use windows::core::*;
 use windows::Win32::Foundation::*;
 use windows::Win32::System::LibraryLoader::*;
 use windows::Win32::UI::WindowsAndMessaging::*;
-use windows_registry::CURRENT_USER;
 use winit::event_loop::EventLoopProxy;
 
 use crate::app::AppMessage;
-
-#[cfg(debug_assertions)]
-const APP_REG_KEY: &str = "SOFTWARE\\amrbashir\\komorebi-switcher-debug";
-#[cfg(not(debug_assertions))]
-const APP_REG_KEY: &str = "SOFTWARE\\amrbashir\\komorebi-switcher";
-
-const WINDOW_POS_X_KEY: &str = "window-pos-x";
-const WINDOW_POS_Y_KEY: &str = "window-pos-y";
+use crate::main_window::MainWindowView;
+use crate::window_registry_info::WindowRegistryInfo;
 
 #[cfg(debug_assertions)]
 const HOST_CLASSNAME: PCWSTR = w!("komorebi-switcher-debug::host");
 #[cfg(not(debug_assertions))]
 const HOST_CLASSNAME: PCWSTR = w!("komorebi-switcher::host");
 
+pub unsafe fn create_host(
+    taskbar_hwnd: HWND,
+    proxy: EventLoopProxy<AppMessage>,
+    window_info: &WindowRegistryInfo,
+) -> anyhow::Result<HWND> {
+    let hinstance = unsafe { GetModuleHandleW(None) }?;
+
+    let mut rect = RECT::default();
+    GetClientRect(taskbar_hwnd, &mut rect)?;
+
+    let wc = WNDCLASSW {
+        hInstance: hinstance.into(),
+        lpszClassName: HOST_CLASSNAME,
+        style: CS_HREDRAW | CS_VREDRAW,
+        lpfnWndProc: Some(wndproc_host),
+        ..Default::default()
+    };
+
+    let atom = RegisterClassW(&wc);
+    debug_assert!(atom != 0);
+
+    let userdata = WndProcUserData { proxy };
+
+    let height = if window_info.auto_height {
+        rect.bottom - rect.top
+    } else {
+        window_info.height
+    };
+
+    let hwnd = CreateWindowExW(
+        WS_EX_NOACTIVATE | WS_EX_NOREDIRECTIONBITMAP,
+        HOST_CLASSNAME,
+        PCWSTR::null(),
+        WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS,
+        window_info.x,
+        window_info.y,
+        window_info.width,
+        height,
+        Some(taskbar_hwnd),
+        None,
+        None,
+        Some(Box::into_raw(Box::new(userdata)) as _),
+    )?;
+
+    SetWindowPos(
+        hwnd,
+        Some(HWND_TOP),
+        0,
+        0,
+        0,
+        0,
+        SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE,
+    )?;
+
+    Ok(hwnd)
+}
+
 struct WndProcUserData {
     proxy: EventLoopProxy<AppMessage>,
-    taskbar_hwnd: HWND,
 }
 
 impl WndProcUserData {
@@ -31,23 +80,6 @@ impl WndProcUserData {
     }
 }
 
-unsafe extern "system" fn enum_child_proc(hwnd: HWND, lparam: LPARAM) -> BOOL {
-    let children = &mut *(lparam.0 as *mut Vec<HWND>);
-    children.push(hwnd);
-    true.into()
-}
-
-fn enum_child_windows(hwnd: HWND) -> Vec<HWND> {
-    let mut children = Vec::new();
-
-    let children_ptr = &mut children as *mut Vec<HWND>;
-    let children_ptr = LPARAM(children_ptr as _);
-
-    let _ = unsafe { EnumChildWindows(Some(hwnd), Some(enum_child_proc), children_ptr) };
-
-    children
-}
-
 unsafe extern "system" fn wndproc_host(
     hwnd: HWND,
     msg: u32,
@@ -70,43 +102,14 @@ unsafe extern "system" fn wndproc_host(
             }
         }
 
-        // Disable position changes in y direction
-        // and clamp x direction to stay visible in taskbar
-        WM_WINDOWPOSCHANGING => {
-            let window_pos = &mut *(lparam.0 as *mut WINDOWPOS);
-            window_pos.y = 0;
-
-            let userdata = WndProcUserData::from_hwnd(hwnd);
-
-            let mut rect = RECT::default();
-            if GetClientRect(userdata.taskbar_hwnd, &mut rect).is_ok() {
-                window_pos.x = window_pos.x.max(0).min(rect.right - window_pos.cx);
-            }
-        }
-
-        // Save host position to be loaded on startup
-        WM_WINDOWPOSCHANGED => {
-            let window_pos = &*(lparam.0 as *const WINDOWPOS);
-
-            let key = CURRENT_USER.create(APP_REG_KEY);
-            if let Ok(key) = key {
-                let x = window_pos.x;
-                let y = window_pos.y;
-
-                tracing::debug!("Storing window position into registry {x},{y}");
-
-                if let Err(e) = key.set_string(WINDOW_POS_X_KEY, &x.to_string()) {
-                    tracing::error!("Failed to store window pos x into registry: {e}")
-                }
-
-                if let Err(e) = key.set_string(WINDOW_POS_Y_KEY, &y.to_string()) {
-                    tracing::error!("Failed to store window pos y into registry: {e}")
-                }
-            }
-        }
-
         // Resize children when this host is resized
         WM_SIZE => {
+            // Skip resizing children if this host is in resize mode
+            let prop = GetPropW(hwnd, MainWindowView::IN_RESIZE_PROP);
+            if prop.0 as isize != 0 {
+                return DefWindowProcW(hwnd, msg, wparam, lparam);
+            }
+
             let mut rect = RECT::default();
             if GetClientRect(hwnd, &mut rect).is_ok() {
                 let width = rect.right - rect.left;
@@ -154,62 +157,19 @@ unsafe extern "system" fn wndproc_host(
     DefWindowProcW(hwnd, msg, wparam, lparam)
 }
 
-pub unsafe fn create_host(
-    taskbar_hwnd: HWND,
-    proxy: EventLoopProxy<AppMessage>,
-) -> anyhow::Result<HWND> {
-    let hinstance = unsafe { GetModuleHandleW(None) }?;
-
-    let mut rect = RECT::default();
-    GetClientRect(taskbar_hwnd, &mut rect)?;
-
-    let wc = WNDCLASSW {
-        hInstance: hinstance.into(),
-        lpszClassName: HOST_CLASSNAME,
-        style: CS_HREDRAW | CS_VREDRAW,
-        lpfnWndProc: Some(wndproc_host),
-        ..Default::default()
-    };
-
-    let atom = RegisterClassW(&wc);
-    debug_assert!(atom != 0);
-
-    tracing::debug!("Loading window position from registry");
-    let key = CURRENT_USER.create(APP_REG_KEY)?;
-    let window_pos_x = key.get_string(WINDOW_POS_X_KEY).ok();
-    let window_pos_y = key.get_string(WINDOW_POS_Y_KEY).ok();
-    let window_pos_x = window_pos_x.and_then(|s| s.parse().ok());
-    let window_pos_y = window_pos_y.and_then(|s| s.parse().ok());
+unsafe extern "system" fn enum_child_proc(hwnd: HWND, lparam: LPARAM) -> BOOL {
+    let children = &mut *(lparam.0 as *mut Vec<HWND>);
+    children.push(hwnd);
+    true.into()
+}
 
-    let userdata = WndProcUserData {
-        proxy,
-        taskbar_hwnd,
-    };
+fn enum_child_windows(hwnd: HWND) -> Vec<HWND> {
+    let mut children = Vec::new();
 
-    let hwnd = CreateWindowExW(
-        WS_EX_NOACTIVATE | WS_EX_NOREDIRECTIONBITMAP,
-        HOST_CLASSNAME,
-        PCWSTR::null(),
-        WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS,
-        window_pos_x.unwrap_or(16),
-        window_pos_y.unwrap_or(0),
-        200,
-        rect.bottom - rect.top,
-        Some(taskbar_hwnd),
-        None,
-        None,
-        Some(Box::into_raw(Box::new(userdata)) as _),
-    )?;
+    let children_ptr = &mut children as *mut Vec<HWND>;
+    let children_ptr = LPARAM(children_ptr as _);
 
-    SetWindowPos(
-        hwnd,
-        Some(HWND_TOP),
-        0,
-        0,
-        0,
-        0,
-        SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE,
-    )?;
+    let _ = unsafe { EnumChildWindows(Some(hwnd), Some(enum_child_proc), children_ptr) };
 
-    Ok(hwnd)
+    children
 }

src/main.rs

@@ -13,8 +13,10 @@ mod egui_glue;
 mod host;
 mod komorebi;
 mod main_window;
+mod resize_window;
 mod tray_icon;
 mod widgets;
+mod window_registry_info;
 
 fn run() -> anyhow::Result<()> {
     let evl = EventLoop::<AppMessage>::with_user_event().build()?;
@@ -28,7 +30,7 @@ fn run() -> anyhow::Result<()> {
 
     let taskbar_hwnd = unsafe { FindWindowW(w!("Shell_TrayWnd"), PCWSTR::null()) }?;
 
-    let mut app = App::new(taskbar_hwnd, evl.create_proxy());
+    let mut app = App::new(taskbar_hwnd, evl.create_proxy())?;
     evl.run_app(&mut app)?;
 
     Ok(())