diff --git a/src/renderer/src/pages/home/Navbar.tsx b/src/renderer/src/pages/home/Navbar.tsx index 45dc5cfa58..c9e2797a8b 100644 --- a/src/renderer/src/pages/home/Navbar.tsx +++ b/src/renderer/src/pages/home/Navbar.tsx @@ -5,6 +5,7 @@ import MinAppsPopover from '@renderer/components/Popups/MinAppsPopover' import SearchPopup from '@renderer/components/Popups/SearchPopup' import { isMac } from '@renderer/config/constant' import { useAssistant } from '@renderer/hooks/useAssistant' +import { useFullscreen } from '@renderer/hooks/useFullscreen' import { modelGenerating } from '@renderer/hooks/useRuntime' import { useSettings } from '@renderer/hooks/useSettings' import { useShortcut } from '@renderer/hooks/useShortcuts' @@ -33,6 +34,7 @@ interface Props { const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, activeTopic, setActiveTopic }) => { const { assistant } = useAssistant(activeAssistant.id) const { showAssistants, toggleShowAssistants } = useShowAssistants() + const isFullscreen = useFullscreen() const { topicPosition, sidebarIcons, narrowMode } = useSettings() const { showTopics, toggleShowTopics } = useShowTopics() const dispatch = useAppDispatch() @@ -90,7 +92,7 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, activeTo {showAssistants && ( - + @@ -113,7 +115,7 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, activeTo toggleShowAssistants()} - style={{ marginRight: 8, marginLeft: isMac ? 4 : -12 }}> + style={{ marginRight: 8, marginLeft: isMac && !isFullscreen ? 4 : -12 }}> @@ -123,7 +125,7 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, activeTo toggleShowAssistants()} - style={{ marginRight: 8, marginLeft: isMac ? 4 : -12 }} + style={{ marginRight: 8, marginLeft: isMac && !isFullscreen ? 4 : -12 }} onMouseOut={() => setSidebarHideCooldown(false)}>