feat: new config file and settings window (#27)

Author: amrbashir

CHANGELOG.md

@@ -4,13 +4,19 @@
 
 ### Added
 
-- Add button to show active workspace layout and click to cycle through available layouts.
+- Added new config at `~/.config/komorebi-switcher.toml`
+- Added new "Settings" menu item in Right click menu and tray icon.
+- Added button to show active workspace layout and click to cycle through available layouts (Enable it through Settings or config).
 
 ### Changed
 
-- Config is saved to `~/.config/komorebi-switcher.toml` instead of being hidden in Windows Registry and to also support new config options on macOS.
+- Migrated config options stored in Windows Registry to the new TOML config.
 - Active workspace indicator will no longer appear on top of the switcher button and will always be at the bottom of it.
 
+### Removed
+
+- Removed "Move and Resize" menu items from Right click menu and tray icon.
+
 ## [0.9.2] - 2026-01-06
 
 ### Fixed

README.md

@@ -29,20 +29,31 @@ Or using Homebrew (macOS):
 brew install amrbashir/tap/komorebi-switcher
 ```
 
-## Usage
-
-- <kbd>Left Click</kbd> any workspace to switch to it.
-- <kbd>Right Click</kbd> to open the context menu:
-
-  - **Move & Resize** (Windows): Open the move and resize dialog.
-
-    ![Move and Resize panel](assets/screenshots/move-resize-panel.png)
-
-  - **Refresh** (Windows): Force recreate switcher windows.
-  - **Quit**: Quit the app
-
-> [!TIP]
-> You can also open the context menu from the tray icon on Windows.
+## Config
+
+The config is located at `~/.config/komorebi-switcher.toml`. You can edit this file directly
+or use the settings window accessible from the context menu.
+
+```toml
+# Global settings
+show_layout_button = false
+
+# Settings for each monitor (Windows only for now)
+#   Syntax is [monitors.<id>] where <id> is one of:
+#     - serial_number_id
+#     - device_id
+#     - name
+#   The app will try to match in the above order, depending on what info is available,
+#   Run `komorebic monitor-information` to get info about your monitors
+[monitors.0]
+x = 378
+y = 1
+width = 402
+height = 65
+auto_width = true
+auto_height = true
+show_layout_button = false # Can be removed to use the global setting
+```
 
 ## Development
 

assets/screenshots/move-resize-panel.png

@@ -12,11 +12,17 @@ pub struct WindowConfig {
     pub height: i32,
     pub auto_width: bool,
     pub auto_height: bool,
+    #[serde(default)]
+    pub show_layout_button: Option<bool>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct Config {
+    #[serde(skip_serializing_if = "HashMap::is_empty", default)]
     pub monitors: HashMap<String, WindowConfig>,
+
+    #[serde(default)]
+    pub show_layout_button: bool,
 }
 
 impl Config {
@@ -46,16 +52,19 @@ impl Config {
                 config_file.display()
             );
 
+            #[allow(unused_mut)]
             let mut config = Config::default();
+
             #[cfg(target_os = "windows")]
             {
                 tracing::info!("Migrating config from Windows registry if any");
 
                 let migrated = Self::migrate_from_registry()?;
                 config.monitors = migrated;
-                config.save()?;
             }
 
+            config.save()?;
+
             Ok(config)
         }
     }
@@ -72,12 +81,19 @@ impl Config {
         Ok(())
     }
 
-    pub fn get(&self, monitor_id: &str) -> Option<&WindowConfig> {
-        self.monitors.get(monitor_id)
+    #[allow(dead_code)]
+    pub fn get_monitor(&self, monitor_id: &str) -> WindowConfig {
+        self.monitors.get(monitor_id).copied().unwrap_or_default()
     }
 
-    pub fn set(&mut self, monitor_id: String, config: WindowConfig) {
-        self.monitors.insert(monitor_id, config);
+    #[allow(dead_code)]
+    pub fn get_monitor_or_default(&mut self, monitor_id: &str) -> &mut WindowConfig {
+        self.monitors.entry(monitor_id.to_string()).or_default()
+    }
+
+    #[allow(dead_code)]
+    pub fn set_monitor(&mut self, monitor_id: &str, config: WindowConfig) {
+        self.monitors.insert(monitor_id.to_string(), config);
     }
 }
 
@@ -122,52 +138,11 @@ impl Config {
                     height,
                     auto_width,
                     auto_height,
+                    show_layout_button: None,
                 },
             );
         }
 
         Ok(monitors)
     }
 }
-
-#[cfg(target_os = "windows")]
-impl WindowConfig {
-    pub fn apply(&mut self, hwnd: windows::Win32::Foundation::HWND) -> anyhow::Result<()> {
-        use windows::Win32::Foundation::*;
-        use windows::Win32::UI::WindowsAndMessaging::*;
-
-        let height = if self.auto_height {
-            let parent = unsafe { GetParent(hwnd) }?;
-            let mut rect = RECT::default();
-            unsafe { GetClientRect(parent, &mut rect) }?;
-            rect.bottom - rect.top
-        } else {
-            self.height
-        };
-
-        let width = if self.auto_width {
-            let child = unsafe { GetWindow(hwnd, GW_CHILD) }?;
-            let mut rect = RECT::default();
-            unsafe { GetClientRect(child, &mut rect) }?;
-            rect.right - rect.left
-        } else {
-            self.width
-        };
-
-        self.width = width;
-        self.height = height;
-
-        unsafe {
-            SetWindowPos(
-                hwnd,
-                None,
-                self.x,
-                self.y,
-                width,
-                height,
-                SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED,
-            )
-            .map_err(Into::into)
-        }
-    }
-}

src/config.rs

@@ -16,44 +16,33 @@ use objc2_foundation::{
 
 use self::workspace_button::WorkspaceButton;
 use self::workspaces_stack_view::WorkspacesStackView;
+use crate::config::Config;
 use crate::macos::layout_button::LayoutButton;
+use crate::macos::windows::settings::SettingsWindowController;
 
 mod layout_button;
+mod windows;
 mod workspace_button;
 mod workspaces_stack_view;
 
-#[derive(Debug)]
+#[derive(Default)]
 pub struct AppDelegateIvars {
     ns_status_item: OnceCell<Retained<NSStatusItem>>,
     ns_stack_view: OnceCell<Retained<WorkspacesStackView>>,
     buttons: RefCell<Vec<Retained<NSView>>>,
-}
-
-impl Default for AppDelegateIvars {
-    fn default() -> Self {
-        Self {
-            ns_status_item: OnceCell::new(),
-            ns_stack_view: OnceCell::new(),
-            buttons: RefCell::new(Vec::new()),
-        }
-    }
+    config: OnceCell<Config>,
+    settings_window: OnceCell<Retained<windows::settings::SettingsWindowController>>,
 }
 
 define_class!(
-    // SAFETY:
-    // - The superclass NSObject does not have any subclassing requirements.
-    // - `Delegate` does not implement `Drop`.
     #[unsafe(super = NSObject)]
     #[thread_kind = MainThreadOnly]
     #[ivars = AppDelegateIvars]
     pub struct AppDelegate;
 
-    // SAFETY: `NSObjectProtocol` has no safety requirements.
     unsafe impl NSObjectProtocol for AppDelegate {}
 
-    // SAFETY: `NSApplicationDelegate` has no safety requirements.
     unsafe impl NSApplicationDelegate for AppDelegate {
-        // SAFETY: The signature is correct.
         #[unsafe(method(applicationDidFinishLaunching:))]
         fn did_finish_launching(&self, notification: &NSNotification) {
             let mtm = self.mtm();
@@ -64,41 +53,36 @@ define_class!(
                 .downcast::<NSApplication>()
                 .unwrap();
 
-            // Set the activation policy to Accessory to hide the dock icon and menu bar.
             app.setActivationPolicy(NSApplicationActivationPolicy::Accessory);
 
-            // Activate the application.
-            // Required when launching unbundled (as is done with Cargo).
             #[allow(deprecated)]
             #[cfg(debug_assertions)]
             app.activateIgnoringOtherApps(true);
 
             let komorebi_state = crate::komorebi::read_state().unwrap_or_default();
 
-            // create status bar item
             let ns_status_bar = NSStatusBar::systemStatusBar();
             let ns_status_item = ns_status_bar.statusItemWithLength(NSVariableStatusItemLength);
 
-            // Create stack view for horizontal button layout
             let stack_view = {
                 let stack = WorkspacesStackView::new(mtm);
                 stack.setOrientation(NSUserInterfaceLayoutOrientation::Horizontal);
                 stack.setSpacing(2.0);
                 stack
             };
 
-            // Add stack view to status item button
             if let Some(btn) = ns_status_item.button(mtm) {
                 btn.addSubview(&stack_view);
             }
 
             let _ = self.ivars().ns_status_item.set(ns_status_item);
             let _ = self.ivars().ns_stack_view.set(stack_view);
 
-            // Create initial workspace buttons
+            let config = Config::load().unwrap_or_default();
+            let _ = self.ivars().config.set(config);
+
             self.update_workspace_buttons(komorebi_state);
 
-            // Listen for komorebi state changes on a separate thread
             std::thread::spawn(|| {
                 crate::komorebi::listen_for_state(|new_state| {
                     Queue::main().exec_async(|| AppDelegate::dispatch_new_state(new_state));
@@ -111,68 +95,69 @@ define_class!(
 impl AppDelegate {
     pub fn new(mtm: MainThreadMarker) -> Retained<Self> {
         let this = Self::alloc(mtm).set_ivars(AppDelegateIvars::default());
-        // SAFETY: The signature of `NSObject`'s `init` method is correct.
         unsafe { msg_send![super(this), init] }
     }
 
     fn dispatch_new_state(state: crate::komorebi::State) {
-        // SAFETY: This is called on the main thread using `Queue::main()`.
         let mtm = MainThreadMarker::new().unwrap();
         let app = NSApp(mtm);
-        // SAFETY: We have set a delegate for the application.
         let delegate = app.delegate().unwrap();
         if let Ok(delegate) = delegate.downcast::<Self>() {
             delegate.update_workspace_buttons(state);
         }
     }
 
+    fn show_or_create_settings_window(&self) {
+        if let Some(existing) = self.ivars().settings_window.get() {
+            existing.show();
+            return;
+        }
+
+        let mtm = self.mtm();
+        let config = self.ivars().config.get().unwrap().clone();
+
+        let window_controller = SettingsWindowController::new(mtm, config);
+
+        let _ = self.ivars().settings_window.set(window_controller);
+        self.ivars().settings_window.get().unwrap().show();
+    }
+
     fn update_workspace_buttons(&self, state: crate::komorebi::State) {
         let mtm = self.mtm();
-        // SAFETY: We have initialized these ivars in `did_finish_launching`.
         let stack_view = self.ivars().ns_stack_view.get().unwrap();
         let mut views = self.ivars().buttons.borrow_mut();
+        let config = self.ivars().config.get().unwrap();
 
-        // Remove all existing buttons from stack view
         for button in views.iter() {
             button.removeFromSuperview();
         }
 
         views.clear();
 
-        // Get first monitor (we only support one for now)
         let Some(monitor) = state.monitors.first() else {
             return;
         };
 
-        // Create new buttons for all workspaces
         for workspace in &monitor.workspaces {
             let workspace_button = WorkspaceButton::new(mtm, workspace);
             stack_view.addArrangedSubview(&workspace_button);
-
-            // Store button
             views.push(workspace_button.downcast().unwrap());
         }
 
-        // show layout button for focused workspace
-        if let Some(focused_ws) = monitor.focused_workspace() {
-            let separator = NSTextField::labelWithString(ns_string!("|"), mtm);
-            separator.setAlignment(NSTextAlignment::Center);
-            stack_view.addArrangedSubview(&separator);
+        if config.show_layout_button {
+            if let Some(focused_ws) = monitor.focused_workspace() {
+                let separator = NSTextField::labelWithString(ns_string!("|"), mtm);
+                separator.setAlignment(NSTextAlignment::Center);
+                stack_view.addArrangedSubview(&separator);
+                views.push(separator.downcast().unwrap());
 
-            // Store separator
-            views.push(separator.downcast().unwrap());
-
-            let layout_button = LayoutButton::new(mtm, focused_ws);
-            stack_view.addArrangedSubview(&layout_button);
-
-            // Store button
-            views.push(layout_button.downcast().unwrap());
+                let layout_button = LayoutButton::new(mtm, focused_ws);
+                stack_view.addArrangedSubview(&layout_button);
+                views.push(layout_button.downcast().unwrap());
+            }
         }
 
-        // SAFETY: We have initialized this ivar in `did_finish_launching`.
         let ns_status_item = self.ivars().ns_status_item.get().unwrap();
-
-        // Update status item button frame to match new stack view size
         if let Some(btn) = ns_status_item.button(mtm) {
             let fitting_size = stack_view.fittingSize();
             let size = NSSize::new(fitting_size.width, WorkspaceButton::HEIGHT);
@@ -184,7 +169,6 @@ impl AppDelegate {
 }
 
 pub fn run() -> anyhow::Result<()> {
-    // SAFETY: `run` is the main entry point and is called on the main thread.
     let mtm = MainThreadMarker::new().unwrap();
 
     let app = NSApplication::sharedApplication(mtm);

src/macos/mod.rs

@@ -0,0 +1 @@
+pub mod settings;

src/macos/windows/mod.rs

@@ -0,0 +1,5 @@
+mod view_controller;
+mod window_controller;
+
+pub use view_controller::SettingsViewController;
+pub use window_controller::SettingsWindowController;