Skip to content

Fix compact menu overlay in compact mode #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Finesssee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compact menu overlay in compact mode #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions src/features/window/custom-title-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,28 @@ const CustomTitleBar = ({ showMinimal = false }: CustomTitleBarProps) => {
>
{/* Left side: keep clear of traffic lights */}
<div className="pointer-events-auto flex min-w-0 items-center gap-2">
{!settings.nativeMenuBar && (
{!settings.nativeMenuBar && !settings.compactMenuBar && (
<CustomMenuBar activeMenu={menuBarActiveMenu} setActiveMenu={setMenuBarActiveMenu} />
)}
{!settings.nativeMenuBar && settings.compactMenuBar && (
<div className="relative">
<Tooltip content="Menu" side="bottom">
<button
onClick={() => {
setMenuBarActiveMenu("File");
}}
className="flex h-6 w-8 items-center justify-center rounded-full border border-border bg-primary-bg/70 py-0.5 text-text-lighter transition-colors hover:bg-hover hover:text-text"
>
<MenuIcon size={16} />
</button>
</Tooltip>
<CustomMenuBar
activeMenu={menuBarActiveMenu}
setActiveMenu={setMenuBarActiveMenu}
compactFloating
/>
</div>
)}
<SidebarPaneSelector
isGitViewActive={isGitViewActive}
isGitHubPRsViewActive={isGitHubPRsViewActive}
Expand Down Expand Up @@ -186,22 +205,29 @@ const CustomTitleBar = ({ showMinimal = false }: CustomTitleBarProps) => {
>
{/* Left side */}
<div data-tauri-drag-region className="flex flex-1 items-center px-1">
{!settings.nativeMenuBar && (
{!settings.nativeMenuBar && !settings.compactMenuBar && (
<CustomMenuBar activeMenu={menuBarActiveMenu} setActiveMenu={setMenuBarActiveMenu} />
)}

{/* Menu bar button */}
{!settings.nativeMenuBar && settings.compactMenuBar && (
<Tooltip content="Menu" side="bottom">
<button
onClick={() => {
setMenuBarActiveMenu("File");
}}
className="mr-2 flex h-6 w-8 items-center justify-center rounded-full border border-border bg-primary-bg/70 py-0.5 text-text-lighter transition-colors hover:bg-hover hover:text-text"
>
<MenuIcon size={16} />
</button>
</Tooltip>
<div className="relative mr-2">
<Tooltip content="Menu" side="bottom">
<button
onClick={() => {
setMenuBarActiveMenu("File");
}}
className="flex h-6 w-8 items-center justify-center rounded-full border border-border bg-primary-bg/70 py-0.5 text-text-lighter transition-colors hover:bg-hover hover:text-text"
>
<MenuIcon size={16} />
</button>
</Tooltip>
<CustomMenuBar
activeMenu={menuBarActiveMenu}
setActiveMenu={setMenuBarActiveMenu}
compactFloating
/>
</div>
)}

<div className="pointer-events-auto mr-2">
Expand Down
7 changes: 6 additions & 1 deletion src/features/window/menu-bar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import Submenu from "./submenu";
interface Props {
activeMenu: string | null;
setActiveMenu: React.Dispatch<React.SetStateAction<string | null>>;
compactFloating?: boolean;
}

const CustomMenuBar = ({ activeMenu, setActiveMenu }: Props) => {
const CustomMenuBar = ({ activeMenu, setActiveMenu, compactFloating = false }: Props) => {
const { settings } = useSettingsStore();
const [themes, setThemes] = useState<ThemeDefinition[]>([]);
const menuBarRef = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -280,6 +281,10 @@ const CustomMenuBar = ({ activeMenu, setActiveMenu }: Props) => {
className={cn(
"z-[10030] flex h-7 items-center gap-1 rounded-full border border-border bg-primary-bg/70 px-1 py-0.5",
settings.compactMenuBar &&
compactFloating &&
"absolute top-[calc(100%+4px)] left-0 rounded-2xl border-border bg-primary-bg/95 shadow-xl backdrop-blur-sm",
settings.compactMenuBar &&
!compactFloating &&
"absolute inset-0 h-full rounded-none border-none bg-transparent px-2 py-0",
)}
>
Expand Down