From ef66cb79d9512785ed582244b4a5ec5056c53ee9 Mon Sep 17 00:00:00 2001
From: James Kerr <kerr@hey.com>
Date: Mon, 11 Dec 2023 14:38:12 -0800
Subject: [PATCH] Fix Sidebar Button Windows

---
 apps/zui/src/js/components/TabBar/TabBar.tsx      | 6 +++++-
 apps/zui/src/plugins/brimcap/packets/menu-item.ts | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/zui/src/js/components/TabBar/TabBar.tsx b/apps/zui/src/js/components/TabBar/TabBar.tsx
index 75ef8bda83..51a5e16d6b 100644
--- a/apps/zui/src/js/components/TabBar/TabBar.tsx
+++ b/apps/zui/src/js/components/TabBar/TabBar.tsx
@@ -30,6 +30,7 @@ const BG = styled.div`
   align-items: center;
   height: 100%;
   grid-area: tabs;
+  gap: 10px;
   -webkit-app-region: drag;
 `
 
@@ -72,13 +73,16 @@ export default function TabBar() {
   useEffect(() => calcWidth(), [rect.width])
   const sidebarCollapsed = !useSelector(Appearance.sidebarIsOpen)
   const rightbarCollapse = !useSelector(Appearance.secondarySidebarIsOpen)
+  const paddingInlineEnd = rightbarCollapse ? 20 : 10
+  const paddingInlineStart = sidebarCollapsed ? 20 : 0
   return (
-    <BG style={{paddingRight: rightbarCollapse ? 20 : 10}}>
+    <BG style={{paddingInlineStart, paddingInlineEnd}}>
       {sidebarCollapsed && global.env.isMac && (
         <TrafficLightBG>
           <SidebarToggleButton />
         </TrafficLightBG>
       )}
+      {sidebarCollapsed && !global.env.isMac && <SidebarToggleButton />}
       <Container ref={ref} onMouseLeave={ctl.onMouseLeave}>
         {ids.map((id: string) => {
           const tabModel = tab(id, lakes, pools, queryIdNameMap, lakeId)
diff --git a/apps/zui/src/plugins/brimcap/packets/menu-item.ts b/apps/zui/src/plugins/brimcap/packets/menu-item.ts
index 971a430ac6..e1a83945d4 100644
--- a/apps/zui/src/plugins/brimcap/packets/menu-item.ts
+++ b/apps/zui/src/plugins/brimcap/packets/menu-item.ts
@@ -39,7 +39,6 @@ export function activatePacketsMenuItem() {
   menus.extend(MENU_NAME, (menu: MenuItem[]) => {
     const index = menu.findIndex((item) => item.id == "export-results")
     menu.splice(index, 0, packetsMenuItem)
-    console.log(index, menu)
     return menu
   })
 }