diff --git a/issues/064-settings-tray-panel.md b/issues/064-settings-tray-panel.md new file mode 100644 index 0000000..0ace0b2 --- /dev/null +++ b/issues/064-settings-tray-panel.md @@ -0,0 +1,39 @@ +# Settings tray panel + +## Owning specification + +Small bug fix authorized by the current user request: Settings is too small, its controls overflow, and it must stay above other windows attached to the Ranch menu-bar icon. + +## What to build + +Verified current observations: the host creates a fixed 380×300 window; the frontend tries to resize it without a window resize capability; the global viewport clips content. Use a screen-bounded native Settings window anchored beneath the tray icon on macOS, with always-on-top independent of the Widget preference. Reopening must restore the anchor. Keep existing preferences and give the content a vertical scroll area that supports long display names and many displays. Other platforms use their tray geometry when available and a work-area fallback otherwise. + +Constitution compliance: retain local state, existing settings contracts, domain separation, and current dependencies; put native window effects in the host and keep the component view-only. This issue adds no IPC capabilities or settings writes. + +## Completion promise + +Opening Settings shows every control inside a usable, vertically scrollable panel that stays above other windows and reopens beneath the Ranch menu-bar icon on macOS, with screen-bounded placement on other platforms. + +## Acceptance criteria + +- [ ] A native macOS check observes Settings beneath the Ranch icon, above other windows, and reanchored on repeated opens, independently of Widget Always on Top. +- [ ] A real rendered-window check observes no horizontal clipping and scroll/keyboard access to every control with many long display labels at 380×300 and the default panel size. +- [x] Geometry regressions cover negative monitor origins, mixed DPI, right-edge icons, short work areas, and top/bottom tray placement and fallback. +- [x] Existing setting updates and keyboard order pass component tests. +- [x] `task check` and `task check:windows` pass after synchronization with current main. + +Native app launch and personal settings changes are outside this session's verification scope. Browser automation is unavailable in this session; native stacking, tray placement, and rendered scrolling remain unverified until an authorized GUI check. Do not mark this issue done before those checks and the normal merge gate. + +## Verification + +- `task check`: exit 0 after rebasing onto main `67140af`; 342 Rust tests (60 host tests) and 179 frontend tests passed, including six geometry checks and keyboard access through every dynamic notification toggle and many displays. +- `task check:windows`: exit 0. Existing unrelated warning: unused `script` in `src-tauri/src/app/claude_plugin/contract.rs:94`; the cross-check uses the expected placeholder sidecar. +- `git diff --check`: exit 0. + +## Blocked by + +None for implementation. Native and rendered-window acceptance checks remain pending. + +## User stories addressed + +Reach and edit all preferences, and find Settings beside the Ranch menu-bar icon whenever it opens. diff --git a/src-tauri/src/app/mod.rs b/src-tauri/src/app/mod.rs index c0d834c..346e40a 100644 --- a/src-tauri/src/app/mod.rs +++ b/src-tauri/src/app/mod.rs @@ -4,6 +4,7 @@ mod claude_hook; mod claude_plugin; pub mod menu; pub mod paths; +mod settings_window; pub mod settings_workflow; pub mod timer_expiry; pub mod tray; @@ -282,26 +283,8 @@ fn now_unix_secs() -> i64 { } pub fn open_settings_window(app: &AppHandle) { - if let Some(win) = app.get_webview_window("settings") { - if win.is_visible().unwrap_or(false) { - let _ = win.set_focus(); - return; - } - // Label still registered but window is closed — destroy to free it - let _ = win.destroy(); - } - match WebviewWindowBuilder::new(app, "settings", WebviewUrl::App("settings.html".into())) - .title("Preferences") - .inner_size(380.0, 300.0) - .min_inner_size(380.0, 100.0) - .decorations(true) - .resizable(false) - .build() - { - Ok(win) => { - let _ = win.show(); - } - Err(e) => log::error!("open_settings_window: {e}"), + if let Err(e) = settings_window::open(app) { + log::error!("open_settings_window: {e}"); } } diff --git a/src-tauri/src/app/settings_window.rs b/src-tauri/src/app/settings_window.rs new file mode 100644 index 0000000..1cfa2c8 --- /dev/null +++ b/src-tauri/src/app/settings_window.rs @@ -0,0 +1,246 @@ +use tauri::{ + AppHandle, LogicalPosition, LogicalRect, LogicalSize, Manager, Monitor, Rect, Runtime, + WebviewUrl, WebviewWindowBuilder, +}; + +fn panel_layout( + work: LogicalRect, + anchor: Option>, + frame: LogicalSize, +) -> LogicalRect { + let right = work.position.x + work.size.width; + let bottom = work.position.y + work.size.height; + let (center_x, top, available_height, above) = match anchor { + Some(anchor) => { + let below = (anchor.position.y + anchor.size.height).max(work.position.y); + let above = anchor.position.y.min(bottom); + if bottom - below >= above - work.position.y { + ( + anchor.position.x + anchor.size.width / 2.0, + below, + bottom - below, + false, + ) + } else { + ( + anchor.position.x + anchor.size.width / 2.0, + above, + above - work.position.y, + true, + ) + } + } + None => (right - 190.0, work.position.y, work.size.height, false), + }; + let width = (380.0 + frame.width).min(work.size.width); + let height = (620.0 + frame.height).min(available_height.max(frame.height + 1.0)); + LogicalRect { + position: LogicalPosition::new( + (center_x - width / 2.0).clamp(work.position.x, right - width), + if above { top - height } else { top }, + ), + size: LogicalSize::new( + (width - frame.width).max(1.0), + (height - frame.height).max(1.0), + ), + } +} + +pub(super) fn open(app: &AppHandle) -> tauri::Result<()> { + let (monitor, anchor) = monitor_and_anchor(app)?; + let window = match app.get_webview_window("settings") { + Some(window) => window, + None => WebviewWindowBuilder::new(app, "settings", WebviewUrl::App("settings.html".into())) + .title("Preferences") + .inner_size(380.0, 620.0) + .decorations(true) + .resizable(false) + .always_on_top(true) + .visible(false) + .build()?, + }; + let scale = monitor.scale_factor(); + let outer = window + .outer_size()? + .to_logical::(window.scale_factor()?); + let inner = window + .inner_size()? + .to_logical::(window.scale_factor()?); + let work = monitor.work_area(); + let layout = panel_layout( + LogicalRect { + position: work.position.to_logical(scale), + size: work.size.to_logical(scale), + }, + anchor, + LogicalSize::new( + (outer.width - inner.width).max(0.0), + (outer.height - inner.height).max(0.0), + ), + ); + window.set_always_on_top(true)?; + window.set_size(layout.size)?; + #[cfg(target_os = "macos")] + window.set_position(layout.position)?; + #[cfg(not(target_os = "macos"))] + window.set_position(layout.position.to_physical::(scale))?; + #[cfg(target_os = "macos")] + { + use objc2::{msg_send, runtime::AnyObject}; + + let raw = window.ns_window()? as *mut AnyObject; + if let Some(window) = unsafe { raw.as_ref() } { + unsafe { + let _: () = msg_send![window, setMovable: false]; + } + } + } + window.unminimize()?; + window.show()?; + window.set_focus() +} + +fn monitor_and_anchor( + app: &AppHandle, +) -> tauri::Result<(Monitor, Option>)> { + if let Some(tray) = app.tray_by_id("main-tray") { + if let Some(rect) = tray.rect()? { + #[cfg(target_os = "macos")] + let point = tray_scale(&tray)?.map(|scale| rect.position.to_logical::(scale)); + #[cfg(not(target_os = "macos"))] + let point = Some(rect.position.to_physical::(1.0)); + if let Some(point) = point { + if let Some(monitor) = app.monitor_from_point(point.x, point.y)? { + let anchor = logical_rect(rect, monitor.scale_factor()); + return Ok((monitor, Some(anchor))); + } + } + } + } + let monitor = app + .primary_monitor()? + .or(app.available_monitors()?.into_iter().next()); + monitor.map(|monitor| (monitor, None)).ok_or_else(|| { + std::io::Error::new( + std::io::ErrorKind::NotFound, + "no monitor available for Settings", + ) + .into() + }) +} + +fn logical_rect(rect: Rect, scale: f64) -> LogicalRect { + LogicalRect { + position: rect.position.to_logical(scale), + size: rect.size.to_logical(scale), + } +} + +#[cfg(target_os = "macos")] +fn tray_scale(tray: &tauri::tray::TrayIcon) -> tauri::Result> { + tray.with_inner_tray_icon(|tray| { + use objc2::{msg_send, runtime::AnyObject}; + + let item = tray.ns_status_item()?; + let raw = &*item as *const _ as *const AnyObject; + // Tray rectangles use their own screen's scale, which can differ from the primary screen. + unsafe { + let button: *mut AnyObject = msg_send![&*raw, button]; + let button = button.as_ref()?; + let window: *mut AnyObject = msg_send![button, window]; + let window = window.as_ref()?; + let scale: f64 = msg_send![window, backingScaleFactor]; + (scale.is_finite() && scale > 0.0).then_some(scale) + } + }) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn rect(x: f64, y: f64, width: f64, height: f64) -> LogicalRect { + LogicalRect { + position: (x, y).into(), + size: (width, height).into(), + } + } + + #[test] + fn opens_beneath_the_menu_bar_icon() { + let layout = panel_layout( + rect(0.0, 24.0, 1440.0, 840.0), + Some(rect(800.0, 0.0, 24.0, 24.0)), + (0.0, 28.0).into(), + ); + + assert_eq!(layout.position, LogicalPosition::new(622.0, 24.0)); + assert_eq!(layout.size, LogicalSize::new(380.0, 620.0)); + } + + #[test] + fn clamps_to_the_right_edge_of_a_negative_origin_monitor() { + let layout = panel_layout( + rect(-1280.0, -776.0, 1280.0, 752.0), + Some(rect(-24.0, -800.0, 24.0, 24.0)), + (0.0, 28.0).into(), + ); + + assert_eq!(layout.position, LogicalPosition::new(-380.0, -776.0)); + } + + #[test] + fn limits_inner_height_to_the_work_area_after_window_decorations() { + let layout = panel_layout( + rect(0.0, 40.0, 800.0, 360.0), + Some(rect(700.0, 0.0, 24.0, 40.0)), + (2.0, 30.0).into(), + ); + + assert_eq!(layout.position, LogicalPosition::new(418.0, 40.0)); + assert_eq!(layout.size, LogicalSize::new(380.0, 330.0)); + } + + #[test] + fn opens_above_a_bottom_taskbar_icon() { + let layout = panel_layout( + rect(0.0, 0.0, 1920.0, 1040.0), + Some(rect(1850.0, 1040.0, 24.0, 40.0)), + (0.0, 28.0).into(), + ); + + assert_eq!(layout.position, LogicalPosition::new(1540.0, 392.0)); + assert_eq!(layout.size.height, 620.0); + } + + #[test] + fn missing_tray_rect_uses_the_work_area_top_right() { + let layout = panel_layout(rect(-800.0, 40.0, 800.0, 360.0), None, (0.0, 28.0).into()); + + assert_eq!(layout.position, LogicalPosition::new(-380.0, 40.0)); + assert_eq!(layout.size, LogicalSize::new(380.0, 332.0)); + } + + #[test] + fn tray_and_work_area_use_the_same_secondary_monitor_scale() { + let anchor = logical_rect( + Rect { + position: tauri::PhysicalPosition::new(-2400, -1600).into(), + size: tauri::PhysicalSize::new(48, 48).into(), + }, + 2.0, + ); + let work = logical_rect( + Rect { + position: tauri::PhysicalPosition::new(-2560, -1552).into(), + size: tauri::PhysicalSize::new(2560, 1504).into(), + }, + 2.0, + ); + + let layout = panel_layout(work, Some(anchor), (0.0, 28.0).into()); + + assert_eq!(layout.position, LogicalPosition::new(-1280.0, -776.0)); + assert_eq!(layout.size, LogicalSize::new(380.0, 620.0)); + } +} diff --git a/src/components/SettingsWindow.test.tsx b/src/components/SettingsWindow.test.tsx index a4a3d29..dd36867 100644 --- a/src/components/SettingsWindow.test.tsx +++ b/src/components/SettingsWindow.test.tsx @@ -1,6 +1,5 @@ import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { createRef } from "react"; import { describe, expect, it, vi } from "vitest"; import type { Settings } from "../types/settings"; import { SettingsWindow } from "./SettingsWindow"; @@ -37,7 +36,6 @@ function renderSettings( onUpdate={onUpdate} onSetDebugOverlay={() => {}} onToggleDevtools={() => {}} - containerRef={createRef()} />, ); } @@ -149,3 +147,46 @@ describe("SettingsWindow notification registry", () => { expect(screen.getByLabelText("Debug Overlay")).not.toBeChecked(); }); }); + +describe("SettingsWindow keyboard access", () => { + it("keeps every display and the last debug control in the keyboard sequence", async () => { + const monitors = Array.from({ length: 12 }, (_, idx) => ({ + idx, + label: `A long monitor label for display ${idx}`, + })); + const notificationSources = [ + ...SOURCES, + { key: "future_source", label: "A future notification" }, + ]; + render( + {}} + onSetDebugOverlay={() => {}} + onToggleDevtools={() => {}} + />, + ); + + for (const control of screen.getAllByRole("spinbutton").slice(0, 2)) { + await userEvent.tab(); + expect(control).toHaveFocus(); + } + const remaining = [ + screen.getByLabelText("Always on Top"), + screen.getByLabelText("Confirm Before Delete"), + screen.getByLabelText("Max pen size"), + ...monitors.map((monitor) => screen.getByLabelText(monitor.label)), + ...notificationSources.map((source) => screen.getByLabelText(source.label)), + screen.getByLabelText("Debug Overlay"), + screen.getByLabelText("DevTools"), + ]; + for (const control of remaining) { + await userEvent.tab(); + expect(control).toHaveFocus(); + } + }); +}); diff --git a/src/components/SettingsWindow.tsx b/src/components/SettingsWindow.tsx index a5a32a8..4cfc30f 100644 --- a/src/components/SettingsWindow.tsx +++ b/src/components/SettingsWindow.tsx @@ -1,4 +1,3 @@ -import type React from "react"; import { useState } from "react"; import type { NotificationSourceDescriptor } from "../types/generated/NotificationSourceDescriptor"; import type { MonitorInfo } from "../types/monitor"; @@ -15,7 +14,6 @@ interface SettingsWindowProps { readonly onUpdate: (next: Settings) => void; readonly onSetDebugOverlay: (enabled: boolean) => void; readonly onToggleDevtools: () => void; - readonly containerRef: React.RefObject; } interface ToggleRowProps { @@ -95,10 +93,9 @@ export function SettingsWindow({ onUpdate, onSetDebugOverlay, onToggleDevtools, - containerRef, }: SettingsWindowProps) { return ( -
} className="settings-window"> +
{settings && ( <>
diff --git a/src/settings.tsx b/src/settings.tsx index 35ae3f5..5aa503c 100644 --- a/src/settings.tsx +++ b/src/settings.tsx @@ -1,12 +1,10 @@ -import { LogicalSize, getCurrentWindow } from "@tauri-apps/api/window"; -import React, { useEffect, useRef } from "react"; +import React from "react"; import ReactDOM from "react-dom/client"; import { SettingsWindow } from "./components/SettingsWindow"; import { useSettingsWindow } from "./hooks/useSettingsWindow"; import "./styles.css"; function SettingsApp() { - const containerRef = useRef(null); const { settings, monitors, @@ -18,21 +16,8 @@ function SettingsApp() { toggleDevtoolsOpen, } = useSettingsWindow(); - useEffect(() => { - const el = containerRef.current; - if (!el) return; - const win = getCurrentWindow(); - const observer = new ResizeObserver(() => { - const h = Math.ceil(el.getBoundingClientRect().height); - win.setSize(new LogicalSize(380, h)).catch(console.error); - }); - observer.observe(el); - return () => observer.disconnect(); - }, []); - return (