-
Notifications
You must be signed in to change notification settings - Fork 22
fix(staged): adapt traffic-light spacer #853
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| import { isTauri } from '../transport'; | ||
|
|
||
| const TRAFFIC_LIGHT_SPACER_WIDTH_PX = 70; | ||
|
|
||
| function isMacPlatform(): boolean { | ||
| if (typeof navigator === 'undefined') return false; | ||
|
|
||
| return /mac/i.test(navigator.platform) || /Macintosh/i.test(navigator.userAgent); | ||
| } | ||
|
|
||
| export const windowChrome = $state({ | ||
| isMac: isMacPlatform(), | ||
| isFullscreen: false, | ||
| }); | ||
|
|
||
| let subscriberCount = 0; | ||
| let stopBrowserResize: (() => void) | null = null; | ||
| let stopTauriResize: (() => void) | null = null; | ||
| let tauriResizeListenerGeneration = 0; | ||
| let fullscreenSyncGeneration = 0; | ||
|
|
||
| async function syncFullscreen() { | ||
| const generation = ++fullscreenSyncGeneration; | ||
|
|
||
| if (!isTauri) { | ||
| windowChrome.isFullscreen = false; | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| const { getCurrentWindow } = await import('@tauri-apps/api/window'); | ||
| const isFullscreen = await getCurrentWindow().isFullscreen(); | ||
| if (generation === fullscreenSyncGeneration && subscriberCount > 0) { | ||
| windowChrome.isFullscreen = isFullscreen; | ||
| } | ||
| } catch (error) { | ||
| console.warn('[windowChrome] Failed to sync fullscreen state:', error); | ||
| if (generation === fullscreenSyncGeneration && subscriberCount > 0) { | ||
| windowChrome.isFullscreen = false; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function syncWindowChrome() { | ||
| windowChrome.isMac = isMacPlatform(); | ||
| void syncFullscreen(); | ||
| } | ||
|
|
||
| function registerTauriResizeListener() { | ||
| if (!isTauri) return; | ||
|
|
||
| const generation = ++tauriResizeListenerGeneration; | ||
|
|
||
| void (async () => { | ||
| const { getCurrentWindow } = await import('@tauri-apps/api/window'); | ||
| const unlisten = await getCurrentWindow().onResized(syncWindowChrome); | ||
|
|
||
| if (subscriberCount === 0 || generation !== tauriResizeListenerGeneration) { | ||
| unlisten(); | ||
| } else { | ||
| stopTauriResize = unlisten; | ||
| } | ||
| })().catch((error) => { | ||
| console.warn('[windowChrome] Failed to watch resize events:', error); | ||
| }); | ||
| } | ||
|
|
||
| export function getTrafficLightSpacerWidth(isMobile: boolean): number { | ||
| if (!isTauri || !windowChrome.isMac || isMobile || windowChrome.isFullscreen) return 0; | ||
| return TRAFFIC_LIGHT_SPACER_WIDTH_PX; | ||
| } | ||
|
|
||
| export function watchWindowChrome(): () => void { | ||
| if (typeof window === 'undefined') return () => {}; | ||
|
|
||
| subscriberCount += 1; | ||
| syncWindowChrome(); | ||
|
|
||
| if (subscriberCount === 1) { | ||
| const onResize = () => syncWindowChrome(); | ||
| window.addEventListener('resize', onResize); | ||
| stopBrowserResize = () => window.removeEventListener('resize', onResize); | ||
| registerTauriResizeListener(); | ||
| } | ||
|
|
||
| return () => { | ||
| subscriberCount = Math.max(0, subscriberCount - 1); | ||
|
|
||
| if (subscriberCount === 0) { | ||
| fullscreenSyncGeneration += 1; | ||
| tauriResizeListenerGeneration += 1; | ||
| stopBrowserResize?.(); | ||
| stopTauriResize?.(); | ||
| stopBrowserResize = null; | ||
| stopTauriResize = null; | ||
| } | ||
| }; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the macOS Tauri window is resized below the mobile breakpoint,
viewport.isMobilebecomes true even though the native traffic-light controls are still visible (the Tauri config allows desktop widths down to 375px withtitleBarStyle: "Overlay"). This condition then collapses the spacer to 0, letting the Back button or other left actions sit underneath the traffic lights; the previous CSS still reserved 58px at this breakpoint. Only actual non-windowed/mobile contexts should remove the spacer.Useful? React with 👍 / 👎.