diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index 8c78ac5b63..92d06b8305 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -38,6 +38,7 @@ import { isCloseTabShortcut, isExecuteSqlShortcut, isFocusSearchShortcut, + isNewQueryShortcut, isObjectSourceSaveShortcutTarget, isRefreshDataShortcut, isSaveShortcut, @@ -587,6 +588,12 @@ function handleKeydown(e: KeyboardEvent) { contentAreaRef.value?.refreshData(); return; } + if (isNewQueryShortcut(e, shortcuts)) { + e.preventDefault(); + e.stopPropagation(); + void newQuery(); + return; + } if (isCloseTabShortcut(e, shortcuts)) { e.preventDefault(); if (showDriverStore.value) { diff --git a/apps/desktop/src/components/layout/AppToolbar.vue b/apps/desktop/src/components/layout/AppToolbar.vue index c34d1f6df3..4ccdf45a26 100644 --- a/apps/desktop/src/components/layout/AppToolbar.vue +++ b/apps/desktop/src/components/layout/AppToolbar.vue @@ -28,7 +28,7 @@ import { } from "@/components/ui/dropdown-menu"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"; import WindowControls from "@/components/layout/WindowControls.vue"; -import { useWindowControls } from "@/composables/useWindowControls"; +import { shouldReserveMacTrafficLightInset, useWindowControls } from "@/composables/useWindowControls"; import { currentLocale, setLocale, type Locale } from "@/i18n"; import type { AppThemeMode } from "@/lib/appTheme"; @@ -68,7 +68,8 @@ const emit = defineEmits<{ }>(); const { t } = useI18n(); -const { isMac, isDesktop, showControls, isMaximized, minimize, toggleMaximize, close } = useWindowControls(); +const { isMac, isDesktop, showControls, isMaximized, isFullscreen, minimize, toggleMaximize, close } = + useWindowControls(); function onToolbarDblClick(e: MouseEvent) { if (isDesktop) return; @@ -81,7 +82,7 @@ function onToolbarDblClick(e: MouseEvent) {