From a853b592a15215fa3fcdf4d6469645ec9721f554 Mon Sep 17 00:00:00 2001 From: baiqing Date: Thu, 30 Apr 2026 18:27:35 +0800 Subject: [PATCH] chore: release 1.2.4 mac titlebar polish --- openless-all/app/package-lock.json | 4 ++-- openless-all/app/package.json | 2 +- openless-all/app/src-tauri/Cargo.lock | 2 +- openless-all/app/src-tauri/Cargo.toml | 2 +- openless-all/app/src-tauri/tauri.conf.json | 6 +++++- openless-all/app/src/components/WindowChrome.tsx | 12 +++++++----- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/openless-all/app/package-lock.json b/openless-all/app/package-lock.json index 14f3ac57..c4e779a8 100644 --- a/openless-all/app/package-lock.json +++ b/openless-all/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "openless-app", - "version": "1.2.2", + "version": "1.2.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openless-app", - "version": "1.2.2", + "version": "1.2.4", "dependencies": { "@tauri-apps/api": "^2.1.1", "@tauri-apps/plugin-shell": "^2.0.1", diff --git a/openless-all/app/package.json b/openless-all/app/package.json index 843703bf..41f3381e 100644 --- a/openless-all/app/package.json +++ b/openless-all/app/package.json @@ -1,7 +1,7 @@ { "name": "openless-app", "private": true, - "version": "1.2.3", + "version": "1.2.4", "type": "module", "scripts": { "dev": "vite", diff --git a/openless-all/app/src-tauri/Cargo.lock b/openless-all/app/src-tauri/Cargo.lock index 0311fd9f..cf0f1ae3 100644 --- a/openless-all/app/src-tauri/Cargo.lock +++ b/openless-all/app/src-tauri/Cargo.lock @@ -3250,7 +3250,7 @@ dependencies = [ [[package]] name = "openless" -version = "1.2.3" +version = "1.2.4" dependencies = [ "anyhow", "arboard", diff --git a/openless-all/app/src-tauri/Cargo.toml b/openless-all/app/src-tauri/Cargo.toml index 68dce5bd..9c069abb 100644 --- a/openless-all/app/src-tauri/Cargo.toml +++ b/openless-all/app/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openless" -version = "1.2.3" +version = "1.2.4" description = "OpenLess — local voice input that types where your cursor is" authors = ["OpenLess"] edition = "2021" diff --git a/openless-all/app/src-tauri/tauri.conf.json b/openless-all/app/src-tauri/tauri.conf.json index 8266cb7c..0e6b0c2d 100644 --- a/openless-all/app/src-tauri/tauri.conf.json +++ b/openless-all/app/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "OpenLess", - "version": "1.2.3", + "version": "1.2.4", "identifier": "com.openless.app", "build": { "beforeDevCommand": "npm run dev", @@ -26,6 +26,10 @@ "shadow": true, "hiddenTitle": true, "titleBarStyle": "Overlay", + "trafficLightPosition": { + "x": 12, + "y": 12 + }, "visible": true }, { diff --git a/openless-all/app/src/components/WindowChrome.tsx b/openless-all/app/src/components/WindowChrome.tsx index 6d9a7ee7..6316c0dc 100644 --- a/openless-all/app/src/components/WindowChrome.tsx +++ b/openless-all/app/src/components/WindowChrome.tsx @@ -24,6 +24,9 @@ export function detectOS(): OS { return 'mac'; } +const MAC_TITLEBAR_HEIGHT = 36; +const MAC_TRAFFIC_LIGHT_RESERVED_WIDTH = 76; + interface WindowChromeProps { os?: OS; title?: string; @@ -54,18 +57,17 @@ export function WindowChrome({ os = 'mac', title = 'OpenLess', children, height }} > {os === 'win' && } - {/* macOS:窗口装饰由系统画三色按钮(titleBarStyle: Overlay), - 这里只放一条不可见的拖动条覆盖在按钮高度上方,让用户能从顶端拖动整个窗口。 - 注意 left 留出 80px 给系统的 close/min/max,否则鼠标按下落在按钮上无法触发 close。 */} + {/* macOS:窗口装饰由系统画三色按钮(titleBarStyle: Overlay + trafficLightPosition), + 顶部拖动区按标准标题栏高度铺开,并避开系统按钮热区。 */} {os === 'mac' && (