BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(desktop): fix Linux window control order and drop auto position (#2434)

Browse Source 
Left-side controls now use macOS traffic-light order (close, minimize,
maximize). Remove the unused auto option and default window controls to
the right for Windows and Linux frameless chrome.

Authored-by: Serhii Dziupin <makeittech@users.noreply.github.com>
This commit is contained in:
Serhii Dziupin
2026-07-26 13:39:46 +03:00
committed by GitHub
parent c9f673582a
commit ae40f0fe7d
18 changed files with 165 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/lib/desktop.ts
+29 -10
View File
@@ -38,8 +38,9 @@ export type SkillCatalogConfig = {
gitIdentityId?: string;
};
export type DesktopWindowControlsPosition = 'auto' | 'left' | 'right';
export type DesktopWindowControlsPosition = 'left' | 'right';
export type DesktopWindowControlsSide = 'left' | 'right';
export type DesktopWindowControlAction = 'close' | 'minimize' | 'maximize';
export type DesktopSettings = {
themeId?: string;
@@ -252,6 +253,9 @@ export const getElectronPlatform = (): string | null => {
/** Width of the three in-app window control buttons when placed on the left (3 × w-8). */
export const DESKTOP_WINDOW_CONTROLS_WIDTH_PX = 96;
/** Default side for in-app window controls (Windows-style, right). */
export const DEFAULT_DESKTOP_WINDOW_CONTROLS_POSITION: DesktopWindowControlsPosition = 'right';
/** Windows and Linux use frameless windows with in-app minimize/maximize/close controls. */
export const usesFramelessElectronChrome = (): boolean => {
if (!isElectronShell()) return false;
@@ -259,21 +263,36 @@ export const usesFramelessElectronChrome = (): boolean => {
return platform === 'win32' || platform === 'linux';
};
export const getDefaultDesktopWindowControlsSide = (platform: string | null = getElectronPlatform()): DesktopWindowControlsSide => {
if (platform === 'linux') {
return 'left';
/** Normalize a stored preference; legacy `auto` maps to the right-side default. */
export const normalizeDesktopWindowControlsPosition = (
value: unknown,
): DesktopWindowControlsPosition | undefined => {
if (value === 'left' || value === 'right') {
return value;
}
return 'right';
// Legacy "auto" never read OS chrome config; treat it as the right default.
if (value === 'auto') {
return DEFAULT_DESKTOP_WINDOW_CONTROLS_POSITION;
}
return undefined;
};
export const resolveDesktopWindowControlsSide = (
preference: DesktopWindowControlsPosition | undefined,
platform: string | null = getElectronPlatform(),
): DesktopWindowControlsSide => {
if (preference === 'left' || preference === 'right') {
return preference;
}
return getDefaultDesktopWindowControlsSide(platform);
return preference === 'left' ? 'left' : DEFAULT_DESKTOP_WINDOW_CONTROLS_POSITION;
};
/**
* Left matches macOS traffic-light order (close, minimize, maximize).
* Right keeps Windows order (minimize, maximize, close).
*/
export const getDesktopWindowControlsOrder = (
side: DesktopWindowControlsSide,
): DesktopWindowControlAction[] => {
return side === 'left'
? ['close', 'minimize', 'maximize']
: ['minimize', 'maximize', 'close'];
};
export const hasDesktopInvoke = (): boolean => {