Refactor window handling, improve theme support, and update dependencies by ItsEeleeya · Pull Request #1807 · CapSoftware/Cap

ItsEeleeya · 2026-05-12T15:24:13Z

Refactor window handling, improve theme support, and modernize native integration

Overview

This PR refactors a few things with small improvements as a base for upcoming PRs. The changes modernize how windows are revealed, streamline macOS integration with native AppKit APIs, and better theme handling.

Key Changes

Window Management Refactoring

Re-implemented auto-show window logic: Windows are now only shown when fully ready, completely eliminating white flashing (except during dev when Vinxi may interfere)
- AutoRevealWindowOnReady: Automatically shows windows once content is loaded
- RevealWindowWithSuspense: Defers visibility for windows like Settings until routing and child mounting completes
Renamed ShowCapWindow → CapWindow throughout the codebase
Main window changes:
- Removed fake traffic lights (Tauri now handles native positioning)
- Removed custom AppDelegate as Tauri now supports custom traffic lights inset
Simplified drag region handling with new data-tauri-drag-region="deep" attribute (eliminates scattered manual markers)
Restored proper native menu behavior: onMouseDown={showCropOptionsMenu} in Editor crop section with onClick as keyboard/touch fallback

Theme/Appearance Improvements

Renamed AppTheme → Appearance (with serde fallback for backward compatibility)
Fixed system theme toggle: Changing theme back to "system" now properly takes effect without requiring a reload
Removed window_transparency from general settings (not visible in UI; will return with full support in future)

Code Organization

Extracted display utilities to new src-tauri/src/display_utils.rs out of windows.rs
- Monitor and display helper logic consolidated
- MonitorExt and CursorMonitorInfo types organized
Cleaned up panel_manager.rs: Now macOS-only with streamlined logic
Moved AppKit menu configuration to new menu.rs module
Added help menu items with native AppKit integration

Native Platform Integration

macOS: Increased usage of objc2 ecosystem crates (app-kit, foundation, permissions)
- Bumped objc2-app-kit version
Linux: Now using Windows 11-style caption controls
Added new WebviewWindowExt trait with with_nswindow_on_main() utility for direct AppKit window access
Settings window: Now persists position across restarts (removed from tauri_plugin_window_state denylist)

UI/UX Enhancements

Editor window header height now matches windows with toolbars on macOS 26
Fixed invisible target-select-overlay appearing over Settings/Upgrade windows when they close (no longer auto-opens)
Fixed Cropper bounds display (removed incorrect scale-50 class)
Small visual refinements in debug window

Dependencies & Plugins

Updated Tauri and associated plugins to latest versions
Added tauri-plugin-prevent-default: Enables default context menu only during development

Technical Notes

All changes maintain backward compatibility where applicable
Window reveal logic fully tested with zero white-flash regressions
AppKit integration now uses modern objc2 crates instead of legacy objc/cocoa
Future improvements planned for macOS focus handling via custom NSTrackingArea in dedicated Tauri plugin
This refactor lays groundwork for upcoming window management and platform-specific enhancements

Greptile Summary

This PR refactors desktop window handling and native integration. The main changes are:

New hidden-window reveal helpers for routed desktop windows.
Renamed ShowCapWindow to CapWindow across Rust and generated bindings.
Theme settings moved from theme to appearance with persisted-store compatibility.
macOS menu and AppKit helpers moved into platform modules.
Display utilities and panel/window handling were reorganized.
Tauri plugins and Rust/JS dependencies were updated.

Confidence Score: 5/5

This looks safe to merge.

No blocking issues found in the changed code.

Important Files Changed

Filename	Overview
apps/desktop/src/utils/RevealWindow.tsx	Adds shared helpers for revealing windows after routing or suspense readiness.
apps/desktop/src/app.tsx	Wires the reveal helper into the desktop router and updates app-level theme behavior.
apps/desktop/src-tauri/src/general_settings.rs	Renames the stored theme setting to `appearance` while accepting the old persisted key.
apps/desktop/src-tauri/src/windows.rs	Refactors Cap window creation, reuse, sizing, visibility, and macOS window configuration.
apps/desktop/src-tauri/src/platform/macos/menu.rs	Adds native macOS menu setup and termination handling.
apps/desktop/src-tauri/src/platform/macos/mod.rs	Adds AppKit window helpers for main-thread native window access.
apps/desktop/src-tauri/src/lib.rs	Registers renamed commands, platform menu hooks, plugins, and startup window behavior.

_{Reviews (3): Last reviewed commit: "Merge branch 'main' into pr/1807" | Re-trigger Greptile}

Context used:

Context used - CLAUDE.md (source)
Context used - AGENTS.md (source)

The header height now matches that of windows with Toolbars on macOS 26

…ier + fix onboarding decorations

The header height now matches that of windows with Toolbars on macOS 26

…ier + fix onboarding decorations

…a/Cap into next-base-improvements

…dark_mode

…ings + tauri.ts

…lugin_window_state's deny list

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

…a/Cap into next-base-improvements

tembo · 2026-07-03T09:54:09Z

        );
    }
-}
+}


Nit: this file is missing a trailing newline (\\ No newline at end of file), which tends to cause noisy diffs.

Suggested change

}

}

tembo · 2026-07-03T09:55:36Z

 		"core:webview:default",
 		"core:webview:allow-create-webview-window",
 		"core:app:allow-version",
+		"core:app:allow-set-app-theme",


This adds core:app:allow-set-app-theme to the default capability. If this is only needed for specific windows/flows, consider scoping it to a narrower capability to keep the allowlist tight.

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

richiemcilroy · 2026-07-03T11:53:46Z

hey @greptileai please review the PR

richiemcilroy · 2026-07-03T12:01:16Z

hey @greptileai please re-review the pr

tembo · 2026-07-03T12:49:49Z


 #[cfg(target_os = "macos")]
-const DEFAULT_TRAFFIC_LIGHTS_INSET: LogicalPosition<f64> = LogicalPosition::new(12.0, 12.0);
+const DEFAULT_TRAFFIC_LIGHTS_INSET: LogicalPosition<f64> = LogicalPosition::new(12.0, 20.0);


Small maintainability nit: these inset values are pretty tuned; a short note helps prevent someone from “fixing” them later without realizing this is for macOS 26 titlebar spacing.

Suggested change

const DEFAULT_TRAFFIC_LIGHTS_INSET: LogicalPosition<f64> = LogicalPosition::new(12.0, 20.0);

const DEFAULT_TRAFFIC_LIGHTS_INSET: LogicalPosition<f64> = LogicalPosition::new(12.0, 20.0); // tuned for macOS 26 titlebar spacing

tembo · 2026-07-03T12:50:16Z

-					showMinimize={false}
-					showZoom={false}
-				/>
+			{isMacOS && !isSettings() && <div class="h-full w-[70px]" />}


This spacer is purely layout; adding aria-hidden avoids it ever being treated as meaningful structure (and makes the intent a bit clearer).

Suggested change

{isMacOS && !isSettings() && <div class="h-full w-[70px]" />}

{isMacOS && !isSettings() && <div class="h-full w-[70px]" aria-hidden="true" />}

ItsEeleeya added 30 commits May 7, 2026 15:37

no NSPanel for main, fix traffic lights, editor header height

a49b55a

The header height now matches that of windows with Toolbars on macOS 26

Bump versions for tauri, tauri-cli, objc2-app-kit

49ba3b6

Fix theme change, rename AppTheme to Appearance

75ba1b3

Correctly display crop options context menu onMouseDown

5faa712

Add more associated file info like UTTypeConformsTo and UTTypeIdentif…

fca4ebf

…ier + fix onboarding decorations

Use non activating style mask on NSPanels and don't make them focused.

33bab32

no NSPanel for main, fix traffic lights, editor header height

5fea9e1

The header height now matches that of windows with Toolbars on macOS 26

Bump versions for tauri, tauri-cli, objc2-app-kit

8eb3360

Fix theme change, rename AppTheme to Appearance

46b007b

Correctly display crop options context menu onMouseDown

ed3c86b

Add more associated file info like UTTypeConformsTo and UTTypeIdentif…

819f9d9

…ier + fix onboarding decorations

Use non activating style mask on NSPanels and don't make them focused.

4a1fad4

Merge branch 'next-base-improvements' of https://github.com/ItsEeleey…

4f19b49

…a/Cap into next-base-improvements

Merge branch 'main' into next-base-improvements

750783a

update tauri-build

2b0a417

Use data-tauri-drag-region="deep"

3b39cf9

Merge branch 'main' into next-base-improvements

7643967

Merge remote-tracking branch 'upstream/main' into next-base-improvements

038ba02

Rename ShowCapWindow to CapWindow

79c5f56

Move display math into display_utils.rs, remove now unused is_system_…

31f364f

…dark_mode

Better window auto show handling

b92ed38

Merge remote-tracking branch 'upstream/main' into next-base-improvements

2827347

clippy

aea51c7

Update windows.rs

acb8758

Remove now unused command set_theme

233041d

Merge remote-tracking branch 'upstream/main' into next-base-improvements

0717879

fix: no longer show invisible target_select_overlay when closing sett…

222096d

…ings + tauri.ts

Remove ensure_settings_window_bounds and Settings window from tauri_p…

079fe32

…lugin_window_state's deny list

Improve window reveal + a little nicer debug window + format

3321f9f

Merge remote-tracking branch 'upstream/main' into next-base-improvements

4eda736

tembo Bot reviewed Jun 26, 2026

View reviewed changes

Comment thread apps/desktop/src-tauri/src/platform/macos/menu.rs Outdated

Comment thread apps/desktop/src-tauri/src/platform/macos/mod.rs Outdated

ItsEeleeya added 3 commits June 28, 2026 10:42

Merge remote-tracking branch 'upstream/main' into next-base-improvements

90817d9

Merge remote-tracking branch 'upstream/main' into next-base-improvements

31294a6

fmt + fix

34a7aad

tembo Bot reviewed Jul 1, 2026

View reviewed changes

Comment thread apps/desktop/src-tauri/src/window_position_persistence.rs

ItsEeleeya added 2 commits July 1, 2026 12:04

Remove redundant PendingState.main

a8261d2

Merge remote-tracking branch 'upstream/main' into next-base-improvements

80c622f

tembo Bot reviewed Jul 2, 2026

View reviewed changes

Comment thread apps/desktop/src/app.tsx

Comment thread apps/desktop/src/utils/RevealWindow.tsx

Comment thread apps/desktop/src/utils/RevealWindow.tsx Outdated

ItsEeleeya and others added 3 commits July 2, 2026 10:33

Update apps/desktop/src/utils/RevealWindow.tsx

dca5075

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

Merge remote-tracking branch 'upstream/main' into next-base-improvements

47b34ab

Update Cargo.lock

4c5cda3

tembo Bot reviewed Jul 3, 2026

View reviewed changes

Comment thread apps/desktop/src-tauri/src/recording.rs Outdated

ItsEeleeya and others added 6 commits July 3, 2026 12:16

fix after merge

35c650c

Update apps/desktop/src-tauri/src/recording.rs

1691028

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

Update apps/desktop/src/utils/RevealWindow.tsx

4830966

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

Apply suggestions from code review

e5ffa95

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

fix regression in recording.rs + default capabilities

514c2fb

Merge branch 'next-base-improvements' of https://github.com/ItsEeleey…

83a0840

…a/Cap into next-base-improvements

tembo Bot reviewed Jul 3, 2026

View reviewed changes

Comment thread apps/desktop/src-tauri/src/platform/macos/menu.rs Outdated

Comment thread apps/desktop/src-tauri/src/windows.rs Outdated

Comment thread apps/desktop/src/routes/(window-chrome)/settings/general.tsx Outdated

fmt + better expect message + use tauri::async_runtime::spawn

e7b5b54

tembo Bot reviewed Jul 3, 2026

View reviewed changes

Update tauri plugins

4620540

tembo Bot reviewed Jul 3, 2026

View reviewed changes

Comment thread apps/desktop/src-tauri/src/windows.rs Outdated

ItsEeleeya and others added 2 commits July 3, 2026 13:37

Update apps/desktop/src-tauri/src/windows.rs

8913e1f

Co-authored-by: tembo[bot] <208362400+tembo[bot]@users.noreply.github.com>

fmt

ca6c3fe

Merge branch 'main' into pr/1807

da77438

Fix traffic lights position for building with macOS 26 SDK

f822d09

tembo Bot reviewed Jul 3, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Refactor window handling, improve theme support, and update dependencies#1807

Refactor window handling, improve theme support, and update dependencies#1807
ItsEeleeya wants to merge 126 commits into
CapSoftware:mainfrom
ItsEeleeya:next-base-improvements

ItsEeleeya commented May 12, 2026 •

edited by greptile-apps Bot

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tembo Bot Jul 3, 2026

Uh oh!

tembo Bot Jul 3, 2026

Uh oh!

Uh oh!

richiemcilroy commented Jul 3, 2026

Uh oh!

richiemcilroy commented Jul 3, 2026

Uh oh!

tembo Bot Jul 3, 2026

Uh oh!

tembo Bot Jul 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

                       );
                   }
-              }
+              }

                
                    No newline at end of file

	const DEFAULT_TRAFFIC_LIGHTS_INSET: LogicalPosition<f64> = LogicalPosition::new(12.0, 20.0);
	const DEFAULT_TRAFFIC_LIGHTS_INSET: LogicalPosition<f64> = LogicalPosition::new(12.0, 20.0); // tuned for macOS 26 titlebar spacing

	{isMacOS && !isSettings() && <div class="h-full w-[70px]" />}
	{isMacOS && !isSettings() && <div class="h-full w-[70px]" aria-hidden="true" />}

Uh oh!

Conversation

ItsEeleeya commented May 12, 2026 • edited by greptile-apps Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Refactor window handling, improve theme support, and modernize native integration

Overview

Key Changes

Window Management Refactoring

Theme/Appearance Improvements

Code Organization

Native Platform Integration

UI/UX Enhancements

Dependencies & Plugins

Technical Notes

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tembo Bot Jul 3, 2026

Choose a reason for hiding this comment

Uh oh!

tembo Bot Jul 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

richiemcilroy commented Jul 3, 2026

Uh oh!

richiemcilroy commented Jul 3, 2026

Uh oh!

tembo Bot Jul 3, 2026

Choose a reason for hiding this comment

Uh oh!

tembo Bot Jul 3, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ItsEeleeya commented May 12, 2026 •

edited by greptile-apps Bot

Loading