diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index ad53263635f..42c823fc382 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -812,6 +812,10 @@ export const dict = { "titlebar.update": "Update", "titlebar.tabs": "Tabs", + "titlebar.channel.local": "Local", + "titlebar.channel.dev": "Dev", + "titlebar.channel.beta": "Beta", + "titlebar.toggleDebugTools": "Toggle debug tools", "titlebar.updateVersion": "Update {{version}}", "common.closeTab": "Close tab", diff --git a/packages/app/src/shell/titlebar/titlebar.tsx b/packages/app/src/shell/titlebar/titlebar.tsx index 68567bd80ee..e5d7a9b58a5 100644 --- a/packages/app/src/shell/titlebar/titlebar.tsx +++ b/packages/app/src/shell/titlebar/titlebar.tsx @@ -1,6 +1,6 @@ import { createEffect, createMemo, createResource, Match, Show, Switch, untrack } from "solid-js" import { createStore, unwrap } from "solid-js/store" -import { Portal } from "solid-js/web" +import { Dynamic, Portal } from "solid-js/web" import { useLocation, useNavigate } from "@solidjs/router" import { IconButton } from "@opencode-ai/ui/icon-button" import { Icon } from "@opencode-ai/ui/icon" @@ -31,12 +31,15 @@ import { SessionTabAvatar } from "@/shell/layout/session-tab-avatar" import { SessionProgressIndicatorV2 } from "@opencode-ai/session-ui/v2/session-progress-indicator-v2" import { projectForSession } from "@/shell/layout/helpers" import { useSettingsDialog } from "@/settings/command" +import devIcon from "../../../../desktop/icons/dev/64x64.png" +import betaIcon from "../../../../desktop/icons/beta/64x64.png" const titlebarHeight = 36 const windowsTitlebarHeight = 44 // Includes the content inset; matches the native Windows overlay. const minTitlebarZoom = 0.25 const windowsControlsBaseWidth = 138 // 3 native Windows caption buttons at 46px each. -const macTrafficLightsBaseWidth = 84 +// Native controls: 14px left inset, two 20px button pitches, and a 14px button. +const macTrafficLightsBaseWidth = 68 const macTrafficLightsTopClearance = 28 export type TitlebarUpdate = { @@ -431,16 +434,15 @@ export function Titlebar(props: { return (