Skip to content

Commit 3675696

Browse files
committed
dont depend on full settings atom. showmenubar also should cause a re-layout
1 parent 4e08aa1 commit 3675696

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

frontend/app/tab/tabbar.tsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
188188
const activeTabId = useAtomValue(env.atoms.staticTabId);
189189
const isFullScreen = useAtomValue(env.atoms.isFullScreen);
190190
const zoomFactor = useAtomValue(env.atoms.zoomFactorAtom);
191-
const settings = useAtomValue(env.atoms.settingsAtom);
191+
const showMenuBar = useAtomValue(env.getSettingsKeyAtom("window:showmenubar"));
192192
const confirmClose = useAtomValue(env.getSettingsKeyAtom("tab:confirmclose")) ?? false;
193193
const hideAiButton = useAtomValue(env.getSettingsKeyAtom("app:hideaibutton"));
194194
const appUpdateStatus = useAtomValue(env.atoms.updaterStatusAtom);
@@ -341,7 +341,17 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
341341
prevAllLoadedRef.current = true;
342342
}
343343
}
344-
}, [tabIds, tabsLoaded, newTabId, saveTabsPosition, hideAiButton, appUpdateStatus, hasConfigErrors, zoomFactor]);
344+
}, [
345+
tabIds,
346+
tabsLoaded,
347+
newTabId,
348+
saveTabsPosition,
349+
hideAiButton,
350+
appUpdateStatus,
351+
hasConfigErrors,
352+
zoomFactor,
353+
showMenuBar,
354+
]);
345355

346356
const getDragDirection = (currentX: number) => {
347357
let dragDirection: string;
@@ -620,7 +630,7 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
620630
}
621631

622632
const tabsWrapperWidth = tabIds.length * tabWidthRef.current;
623-
const showAppMenuButton = env.isWindows() || (!env.isMacOS() && !settings["window:showmenubar"]);
633+
const showAppMenuButton = env.isWindows() || (!env.isMacOS() && !showMenuBar);
624634

625635
// Calculate window drag left width based on platform and state
626636
let windowDragLeftWidth = 10;

frontend/app/tab/tabbarenv.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ export type TabBarEnv = WaveEnvSubset<{
2020
staticTabId: WaveEnv["atoms"]["staticTabId"];
2121
isFullScreen: WaveEnv["atoms"]["isFullScreen"];
2222
zoomFactorAtom: WaveEnv["atoms"]["zoomFactorAtom"];
23-
settingsAtom: WaveEnv["atoms"]["settingsAtom"];
2423
reinitVersion: WaveEnv["atoms"]["reinitVersion"];
2524
updaterStatusAtom: WaveEnv["atoms"]["updaterStatusAtom"];
2625
};
2726
wos: WaveEnv["wos"];
28-
getSettingsKeyAtom: SettingsKeyAtomFnType<"app:hideaibutton" | "tab:confirmclose">;
27+
getSettingsKeyAtom: SettingsKeyAtomFnType<"app:hideaibutton" | "tab:confirmclose" | "window:showmenubar">;
2928
mockSetWaveObj: WaveEnv["mockSetWaveObj"];
3029
isWindows: WaveEnv["isWindows"];
3130
isMacOS: WaveEnv["isMacOS"];

0 commit comments

Comments
 (0)