Skip to content

Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.

refactor: move settings to left on windows/linux

Gabriel Stein7878b652d98c
diff --git a/src/components/SettingsPage.tsx b/src/components/SettingsPage.tsx
index dd1b3f23e..04966ab83 100644
--- a/src/components/SettingsPage.tsx
+++ b/src/components/SettingsPage.tsx
@@ -549,7 +549,7 @@ export default function SettingsPage({ activeSection = "general" }: SettingsPage
</Button>
)}
- {updateInfo.version && (
+ {updateInfo?.version && (
<div className="p-4 bg-blue-50 border border-blue-200 rounded-lg">
<h4 className="font-medium text-blue-900 mb-2">Update v{updateInfo.version}</h4>
{updateInfo.releaseDate && (
diff --git a/src/components/TitleBar.tsx b/src/components/TitleBar.tsx
index e01c6bd19..297326e94 100644
--- a/src/components/TitleBar.tsx
+++ b/src/components/TitleBar.tsx
@@ -21,7 +21,6 @@ export default function TitleBar({
}: TitleBarProps) {
const [showQuitConfirm, setShowQuitConfirm] = useState(false);
- // Get platform info
const platform =
typeof window !== "undefined" && window.electronAPI?.getPlatform
? window.electronAPI.getPlatform()
@@ -35,33 +34,68 @@ export default function TitleBar({
}
};
+ const getActionsContent = () => {
+ if (!actions) return null;
+
+ if (platform !== "darwin" && React.isValidElement(actions)) {
+ const childrenArray = React.Children.toArray(actions.props.children);
+ return <>{[...childrenArray].reverse()}</>;
+ }
+
+ return actions;
+ };
+
return (
<div className={`bg-white border-b border-gray-100 select-none ${className}`}>
<div
className="flex items-center justify-between h-12 px-4"
style={{ WebkitAppRegion: "drag" }}
>
- {/* Left section - title or custom content */}
- <div className="flex items-center gap-2">
- {showTitle && title && <h1 className="text-sm font-semibold text-gray-900">{title}</h1>}
- {children}
+ <div className="flex items-center gap-2" style={{ WebkitAppRegion: "no-drag" }}>
+ {platform !== "darwin" ? (
+ <>
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={() => setShowQuitConfirm(true)}
+ className="h-8 w-8 text-red-600 hover:text-red-700 hover:bg-red-50"
+ title="Quit OpenWhispr"
+ aria-label="Quit OpenWhispr"
+ >
+ <Power size={16} />
+ </Button>
+ {getActionsContent()}
+ </>
+ ) : (
+ <>
+ {showTitle && title && (
+ <h1 className="text-sm font-semibold text-gray-900">{title}</h1>
+ )}
+ {children}
+ </>
+ )}
</div>
- {/* Right section - actions and window controls */}
<div className="flex items-center gap-2" style={{ WebkitAppRegion: "no-drag" }}>
- {actions}
- <Button
- variant="ghost"
- size="icon"
- onClick={() => setShowQuitConfirm(true)}
- className="h-8 w-8 text-red-600 hover:text-red-700 hover:bg-red-50"
- title="Quit OpenWhispr"
- aria-label="Quit OpenWhispr"
- >
- <Power size={16} />
- </Button>
- {/* Show window controls on Linux and Windows (macOS uses native controls) */}
- {platform !== "darwin" && <WindowControls />}
+ {platform !== "darwin" ? (
+ <>
+ <WindowControls />
+ </>
+ ) : (
+ <>
+ {actions}
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={() => setShowQuitConfirm(true)}
+ className="h-8 w-8 text-red-600 hover:text-red-700 hover:bg-red-50"
+ title="Quit OpenWhispr"
+ aria-label="Quit OpenWhispr"
+ >
+ <Power size={16} />
+ </Button>
+ </>
+ )}
</div>
</div>
<ConfirmDialog