From bbdb2225370e041e40e4d03e6a496f0f55027848 Mon Sep 17 00:00:00 2001 From: ZhuchkaTriplesix Date: Sun, 15 Nov 2026 06:38:54 +0300 Subject: [PATCH] fix(ui): place window controls by host OS convention Detect platform via Rust host_platform (UA fallback) and keep a stable three-region title bar: macOS traffic lights on the left, Win/Linux caption buttons pinned on the right, title centered. --- apps/tauri/src-tauri/src/lib.rs | 14 +- apps/tauri/src/main.ts | 10 +- apps/tauri/src/ui/TitleBar.vue | 220 +++++++++++++++++++------------- apps/tauri/src/ui/platform.ts | 65 ++++++++-- 4 files changed, 208 insertions(+), 101 deletions(-) diff --git a/apps/tauri/src-tauri/src/lib.rs b/apps/tauri/src-tauri/src/lib.rs index b0a5e9c2..b3fecdb7 100644 --- a/apps/tauri/src-tauri/src/lib.rs +++ b/apps/tauri/src-tauri/src/lib.rs @@ -4,14 +4,26 @@ fn app_info() -> serde_json::Value { "name": "Querya", "stack": "tauri2-vue3", "version": env!("CARGO_PKG_VERSION"), + "os": std::env::consts::OS, }) } +/// Canonical host OS for chrome layout (`macos` / `windows` / `linux` / other). +#[tauri::command] +fn host_platform() -> String { + match std::env::consts::OS { + "macos" => "macos".into(), + "windows" => "windows".into(), + "linux" => "linux".into(), + other => other.into(), + } +} + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_opener::init()) - .invoke_handler(tauri::generate_handler![app_info]) + .invoke_handler(tauri::generate_handler![app_info, host_platform]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/apps/tauri/src/main.ts b/apps/tauri/src/main.ts index 9ef5ce69..51170e5e 100644 --- a/apps/tauri/src/main.ts +++ b/apps/tauri/src/main.ts @@ -3,9 +3,15 @@ import { createPinia } from "pinia"; import App from "./App.vue"; import "./styles/base.css"; import { initTheme } from "./theme/queryaTheme"; -import { applyPlatformDataset } from "./ui/platform"; +import { + applyPlatformDataset, + detectPlatformFromUa, + resolvePlatform, +} from "./ui/platform"; -applyPlatformDataset(); +// Sync UA hint immediately; Rust `host_platform` corrects it before paint settles. +applyPlatformDataset(detectPlatformFromUa()); +void resolvePlatform().then(applyPlatformDataset); initTheme(); const app = createApp(App); diff --git a/apps/tauri/src/ui/TitleBar.vue b/apps/tauri/src/ui/TitleBar.vue index 9093be73..8d007443 100644 --- a/apps/tauri/src/ui/TitleBar.vue +++ b/apps/tauri/src/ui/TitleBar.vue @@ -1,7 +1,12 @@