Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions apps/desktop/src/app/contrib/wiring.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -980,9 +980,7 @@ export function ContribWiring({ children }: { children: ReactNode }) {
const systemToolsWidth = titlebarToolsWidthCss(SYSTEM_TOOL_COUNT)

const titlebarToolsWidth =
paneToolCount > 0
? `calc(${systemToolsWidth} + ${titlebarToolsWidthCss(paneToolCount)})`
: systemToolsWidth
paneToolCount > 0 ? `calc(${systemToolsWidth} + ${titlebarToolsWidthCss(paneToolCount)})` : systemToolsWidth

return (
<ContribWiringContext.Provider value={api}>
Expand Down
7 changes: 6 additions & 1 deletion apps/desktop/src/app/shell/titlebar-controls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ import {

import { appViewForPath, isOverlayView } from '../routes'

import { TITLEBAR_ICON_BADGE_SCALE, titlebarButtonClass, titlebarIconSizeCss, titlebarToolClusterClass } from './titlebar'
import {
TITLEBAR_ICON_BADGE_SCALE,
titlebarButtonClass,
titlebarIconSizeCss,
titlebarToolClusterClass
} from './titlebar'
import { TitlebarIcon } from './titlebar-icon'

export interface TitlebarTool {
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/src/app/shell/titlebar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const TITLEBAR_CONTROLS_TOP = (TITLEBAR_HEIGHT - TITLEBAR_CONTROL_HEIGHT)
export function titlebarIconSizeCss(scale = 1): string {
return `${TITLEBAR_ICON_SIZE * scale}px`
}

export const TITLEBAR_FALLBACK_WINDOW_BUTTON_X = 24
// Edge inset used when no left-side native controls take up that space —
// Windows/Linux (native overlay is on the right) and macOS fullscreen
Expand Down
Loading