π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(TitleBar):make-titlebar-os-native
Aswin Asok2ed460764387
diff --git a/desktop/changes/native-linux-titlebar.md b/desktop/changes/native-linux-titlebar.mdnew file mode 100644index 0000000000..52f6be0e62--- /dev/null+++ b/desktop/changes/native-linux-titlebar.md@@ -0,0 +1 @@+- Improved desktop title bars to follow the selected theme and use native window decorations on Linux.diff --git a/desktop/src/main.ts b/desktop/src/main.tsindex 8722e97407..b4febf946e 100644--- a/desktop/src/main.ts+++ b/desktop/src/main.ts@@ -167,6 +167,10 @@ const createMainWindow = () => {path.join(isDev ? "build" : process.resourcesPath, "window-icon.png"),);const bounds = windowBounds();+ const themeMode = userPreferences.get("themeMode");+ const shouldUseDarkColors =+ themeMode == "dark" ||+ (themeMode != "light" && nativeTheme.shouldUseDarkColors);const window = new BrowserWindow({webPreferences: {@@ -176,14 +180,24 @@ const createMainWindow = () => {icon,...(bounds ?? {}),...minimumWindowSize(),- // The overlay must be enabled on macOS too for its CSS dimensions.- titleBarStyle: "hidden",- titleBarOverlay:- process.platform == "win32"- ? { color: "black", symbolColor: "#cdcdcd" }- : true,- // Match the initial paint to the OS theme to avoid a white or black flash.- backgroundColor: nativeTheme.shouldUseDarkColors ? "black" : "white",+ // Linux uses its native frame. The overlay remains enabled elsewhere+ // so the renderer receives its CSS dimensions.+ ...(process.platform == "linux"+ ? {}+ : {+ titleBarStyle: "hidden" as const,+ titleBarOverlay:+ process.platform == "win32"+ ? {+ color: shouldUseDarkColors ? "black" : "white",+ symbolColor: shouldUseDarkColors+ ? "#cdcdcd"+ : "black",+ }+ : true,+ }),+ // Match the initial paint to the selected theme to avoid a flash.+ backgroundColor: shouldUseDarkColors ? "black" : "white",show: false,});diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.tsindex fb912df295..6ba3aa0398 100644--- a/desktop/src/main/ipc.ts+++ b/desktop/src/main/ipc.ts@@ -1,6 +1,6 @@import type { FSWatcher } from "chokidar";import type { BrowserWindow, IpcMainEvent, IpcMainInvokeEvent } from "electron";-import { ipcMain, safeStorage } from "electron/main";+import { ipcMain, nativeTheme, safeStorage } from "electron/main";import type {CollectionMapping,FFmpegCommand,@@ -69,6 +69,7 @@ import {watchUpdateSyncedFiles,} from "./services/watch";import { triggerCreateUtilityProcess } from "./services/workers";+import { userPreferences } from "./stores/user-preferences";const parsePersistedAppLockConfig = (config: unknown,@@ -275,6 +276,32 @@ export const attachIPCHandlers = () => {};export const attachMainWindowIPCHandlers = (mainWindow: BrowserWindow) => {+ on(+ "setTitleBarOverlay",+ (_, themeMode: unknown, isFileViewerOpen: unknown) => {+ if (+ (themeMode != "light" &&+ themeMode != "dark" &&+ themeMode != "system") ||+ typeof isFileViewerOpen != "boolean"+ )+ return;++ userPreferences.set("themeMode", themeMode);++ if (process.platform != "win32") return;++ const isDarkTheme =+ themeMode == "dark" ||+ (themeMode == "system" && nativeTheme.shouldUseDarkColors);+ const isDark = isDarkTheme || isFileViewerOpen;+ mainWindow.setTitleBarOverlay({+ color: isDark ? "black" : "white",+ symbolColor: isDark ? "#cdcdcd" : "black",+ });+ },+ );+on("triggerCreateUtilityProcess", (_, type: UtilityProcessType) =>triggerCreateUtilityProcess(type, mainWindow),);diff --git a/desktop/src/main/stores/user-preferences.ts b/desktop/src/main/stores/user-preferences.tsindex 49536a7d1f..96f9ca57e7 100644--- a/desktop/src/main/stores/user-preferences.ts+++ b/desktop/src/main/stores/user-preferences.ts@@ -1,4 +1,5 @@import Store, { Schema } from "electron-store";+import type { ThemeMode } from "../../types/ipc";interface UserPreferences {hideDockIcon?: boolean;@@ -7,6 +8,7 @@ interface UserPreferences {lastShownChangelogVersion?: number;windowBounds?: { x: number; y: number; width: number; height: number };isWindowMaximized?: boolean;+ themeMode?: ThemeMode;}const userPreferencesSchema: Schema<UserPreferences> = {@@ -23,6 +25,7 @@ const userPreferencesSchema: Schema<UserPreferences> = {},},isWindowMaximized: { type: "boolean" },+ themeMode: { type: "string", enum: ["light", "dark", "system"] },};export const userPreferences = new Store({diff --git a/desktop/src/preload.ts b/desktop/src/preload.tsindex a19062af17..f467a7dd9f 100644--- a/desktop/src/preload.ts+++ b/desktop/src/preload.ts@@ -16,6 +16,7 @@ import type {NativeDeviceLockCapability,PendingUploads,PersistedAppLockConfig,+ ThemeMode,UtilityProcessType,ZipItem,} from "./types/ipc";@@ -105,6 +106,9 @@ const onMainWindowBlur = (cb: (() => void) | undefined) => {if (cb) ipcRenderer.on("mainWindowBlur", cb);};+const setTitleBarOverlay = (themeMode: ThemeMode, isFileViewerOpen: boolean) =>+ ipcRenderer.send("setTitleBarOverlay", themeMode, isFileViewerOpen);+const onOpenEnteURL = (cb: ((url: string) => void) | undefined) => {ipcRenderer.removeAllListeners("openEnteURL");if (cb) ipcRenderer.on("openEnteURL", (_, url: string) => cb(url));@@ -289,6 +293,7 @@ contextBridge.exposeInMainWorld("electron", {promptDeviceLock,onMainWindowFocus,onMainWindowBlur,+ setTitleBarOverlay,onOpenEnteURL,onAppUpdateAvailable,diff --git a/desktop/src/types/ipc.ts b/desktop/src/types/ipc.tsindex 9ee53e4fae..35eb595a58 100644--- a/desktop/src/types/ipc.ts+++ b/desktop/src/types/ipc.ts@@ -1,6 +1,8 @@// Keep these definitions in sync with web/packages/base/types/ipc.ts.export type UtilityProcessType = "ml";+export type ThemeMode = "light" | "dark" | "system";+export interface AppUpdate {autoUpdatable: boolean;version: string;diff --git a/web/apps/photos/src/components/FileListWithViewer.tsx b/web/apps/photos/src/components/FileListWithViewer.tsxindex 2e110efa7c..c35da63038 100644--- a/web/apps/photos/src/components/FileListWithViewer.tsx+++ b/web/apps/photos/src/components/FileListWithViewer.tsx@@ -150,7 +150,7 @@ export const FileListWithViewer: React.FC<FileListWithViewerProps> = ({const [highlightCommentID, setHighlightCommentID] = useState<string | undefined>(undefined);- const { showNotification } = usePhotosAppContext();+ const { showNotification, setIsFileViewerOpen } = usePhotosAppContext();const { mode: colorSchemeMode, systemMode } = useColorScheme();const theme = useTheme();const resolvedMode =@@ -159,29 +159,38 @@ export const FileListWithViewer: React.FC<FileListWithViewerProps> = ({: (colorSchemeMode ?? theme.palette.mode);const isDarkMode = resolvedMode === "dark";+ const updateOpenFileViewer = useCallback(+ (open: boolean) => {+ setOpenFileViewer(open);+ setIsFileViewerOpen?.(open);+ onSetOpenFileViewer?.(open);+ },+ [onSetOpenFileViewer, setIsFileViewerOpen],+ );++ useEffect(() => () => setIsFileViewerOpen?.(false), [setIsFileViewerOpen]);+useEffect(() => {if (pendingFileIndex !== undefined) {setCurrentIndex(pendingFileIndex);setInitialSidebar(pendingFileSidebar);setHighlightCommentID(pendingHighlightCommentID);- setOpenFileViewer(true);- onSetOpenFileViewer?.(true);+ updateOpenFileViewer(true);onPendingNavigationConsumed?.();}}, [pendingFileIndex,pendingFileSidebar,pendingHighlightCommentID,- onSetOpenFileViewer,+ updateOpenFileViewer,onPendingNavigationConsumed,]);const handleCloseFileViewerInternal = useCallback(() => {setInitialSidebar(undefined);setHighlightCommentID(undefined);- onSetOpenFileViewer?.(false);- setOpenFileViewer(false);- }, [onSetOpenFileViewer]);+ updateOpenFileViewer(false);+ }, [updateOpenFileViewer]);const annotatedFiles = useMemo((): FileListAnnotatedFile[] =>@@ -195,10 +204,9 @@ export const FileListWithViewer: React.FC<FileListWithViewerProps> = ({const handleThumbnailClick = useCallback((index: number) => {setCurrentIndex(index);- setOpenFileViewer(true);- onSetOpenFileViewer?.(true);+ updateOpenFileViewer(true);},- [onSetOpenFileViewer],+ [updateOpenFileViewer],);const handleTriggerRemotePull = useCallback(diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsxindex d80a146cb3..369db73379 100644--- a/web/apps/photos/src/pages/_app.tsx+++ b/web/apps/photos/src/pages/_app.tsx@@ -16,7 +16,7 @@ import "@fontsource-variable/inter";import "@fontsource-variable/outfit";import ArrowForwardIcon from "@mui/icons-material/ArrowForward";import { CssBaseline, Typography } from "@mui/material";-import { styled, ThemeProvider } from "@mui/material/styles";+import { styled, ThemeProvider, useColorScheme } from "@mui/material/styles";import {isLocalStorageAndIndexedDBMismatch,savedLocalUser,@@ -76,6 +76,7 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {const { loadingBarRef, showLoadingBar, hideLoadingBar } = useLoadingBar();const [watchFolderView, setWatchFolderView] = useState(false);+ const [isFileViewerOpen, setIsFileViewerOpen] = useState(false);const logout = useCallback(() => void photosLogout(), []);@@ -146,6 +147,7 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {hideLoadingBar,watchFolderView,setWatchFolderView,+ setIsFileViewerOpen,showNotification,}),[@@ -153,6 +155,7 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {hideLoadingBar,watchFolderView,setWatchFolderView,+ setIsFileViewerOpen,showNotification,],);@@ -168,7 +171,11 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {<AttributedMiniDialog {...miniDialogProps} /><Notification {...notificationProps} />- {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}+ {isDesktop && (+ <WindowTitlebar {...{ isFileViewerOpen }}>+ {title}+ </WindowTitlebar>+ )}<BaseContext value={baseContext}><PhotosAppContext value={appContext}>{!isI18nReady ? (@@ -240,18 +247,31 @@ const DesktopMainContent: React.FC<MainContentProps> = ({);};-const WindowTitlebar: React.FC<React.PropsWithChildren> = ({ children }) => (- <WindowTitlebarArea>- <Typography variant="small" sx={{ mt: "2px", fontWeight: "bold" }}>- {children}- </Typography>- </WindowTitlebarArea>-);+const WindowTitlebar: React.FC<+ React.PropsWithChildren<{ isFileViewerOpen: boolean }>+> = ({ children, isFileViewerOpen }) => {+ const { mode, systemMode } = useColorScheme();++ useEffect(() => {+ if (mode && (mode != "system" || systemMode)) {+ globalThis.electron?.setTitleBarOverlay(mode, isFileViewerOpen);+ }+ }, [isFileViewerOpen, mode, systemMode]);++ return (+ <WindowTitlebarArea>+ <Typography variant="small" sx={{ mt: "2px", fontWeight: "bold" }}>+ {children}+ </Typography>+ </WindowTitlebarArea>+ );+};// Electron uses this as a window drag region.const WindowTitlebarArea = styled(CenteredRow)`width: 100%;- height: env(titlebar-area-height, 30px);+ height: env(titlebar-area-height, 0px);flex-shrink: 0;+ overflow: hidden;app-region: drag;`;diff --git a/web/packages/base/components/mui/SidebarDrawer.tsx b/web/packages/base/components/mui/SidebarDrawer.tsxindex dca29702ac..3d7b4fc57e 100644--- a/web/packages/base/components/mui/SidebarDrawer.tsx+++ b/web/packages/base/components/mui/SidebarDrawer.tsx@@ -44,7 +44,7 @@ const AppTitlebarBackdrop = styled("div")(({ theme }) => ({top: 0,left: 0,width: "100%",- minHeight: "env(titlebar-area-height, 30px)",+ minHeight: "env(titlebar-area-height, 0px)",zIndex: 1,backgroundColor: theme.vars.palette.backdrop.muted,backdropFilter: "blur(12px)",diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.tsindex 633a58aaad..0664578fdc 100644--- a/web/packages/base/types/ipc.ts+++ b/web/packages/base/types/ipc.ts@@ -1,4 +1,6 @@// Keep this bridge in sync with desktop/src/types/ipc.ts and desktop/src/preload.ts.+export type ThemeMode = "light" | "dark" | "system";+export type NativeDeviceLockProvider = "touchid" | "none";export type NativeDeviceLockUnavailableReason =@@ -39,6 +41,10 @@ export interface Electron {clearAppLockConfigFromSafeStorage: () => Promise<void>;onMainWindowFocus: (cb: (() => void) | undefined) => void;onMainWindowBlur: (cb: (() => void) | undefined) => void;+ setTitleBarOverlay: (+ themeMode: ThemeMode,+ isFileViewerOpen: boolean,+ ) => void;onOpenEnteURL: (cb: ((url: string) => void) | undefined) => void;lastShownChangelogVersion: () => Promise<number | undefined>;setLastShownChangelogVersion: (version: number) => Promise<void>;diff --git a/web/packages/new/photos/types/context.ts b/web/packages/new/photos/types/context.tsindex dbc51544ac..ef2ad07a0d 100644--- a/web/packages/new/photos/types/context.ts+++ b/web/packages/new/photos/types/context.ts@@ -7,6 +7,7 @@ export interface PhotosAppContextT {showNotification: (attributes: NotificationAttributes) => void;watchFolderView: boolean;setWatchFolderView: (isOpen: boolean) => void;+ setIsFileViewerOpen?: (isOpen: boolean) => void;}export const PhotosAppContext = createContext<PhotosAppContextT | undefined>(