From 559e224301b7c21c44daaa6a4e68c6612992f986 Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Sat, 11 Jul 2026 07:52:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(desktop):=20=E8=AE=BE=E7=BD=AE=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=B0=BA=E5=AF=B8=E5=9B=9E=E5=BD=92=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=A4=A7=E5=B0=8F=20+=20=E5=8E=9F=E7=94=9F?=
 =?UTF-8?q?=E8=B4=B4=E5=BD=A2=E9=98=B4=E5=BD=B1=20+=20=E7=BA=A2=E7=BB=BF?=
 =?UTF-8?q?=E7=81=AF=E5=AF=B9=E9=BD=90=20+=20=E6=98=BE=E5=BC=8F=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E6=9D=83=E9=99=90=EF=BC=8812A=20=E5=AE=9E=E6=B5=8B?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 去掉 16px CSS 阴影边距方案（窗口比观感大、外圈灰影、点击区域错位）：
  transparent 窗口开 macOS 原生阴影，阴影贴合内容圆角，窗口 440x560
  即卡片本体
- trafficLightPosition {16,12}：红绿灯垂直居中于 36px 自绘顶条，与
  「dudu 设置」标题对齐
- capabilities 显式加 core:window:allow-start-dragging，保证
  data-tauri-drag-region 拖拽可用

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 desktop/src-tauri/capabilities/default.json     | 15 +++++++++++++--
 desktop/src-tauri/gen/schemas/capabilities.json |  2 +-
 desktop/src-tauri/tauri.conf.json               | 10 +++++-----
 desktop/src/settings/SettingsApp.jsx            |  7 ++++---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/desktop/src-tauri/capabilities/default.json b/desktop/src-tauri/capabilities/default.json
index 489dee5..0975742 100644
--- a/desktop/src-tauri/capabilities/default.json
+++ b/desktop/src-tauri/capabilities/default.json
@@ -2,6 +2,17 @@
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "default",
   "description": "所有窗口的基础能力：核心 IPC（invoke/listen）+ 全局快捷键",
-  "windows": ["settings", "overlay", "tray", "login", "feedback", "onboarding"],
-  "permissions": ["core:default", "global-shortcut:default"]
+  "windows": [
+    "settings",
+    "overlay",
+    "tray",
+    "login",
+    "feedback",
+    "onboarding"
+  ],
+  "permissions": [
+    "core:default",
+    "global-shortcut:default",
+    "core:window:allow-start-dragging"
+  ]
 }
diff --git a/desktop/src-tauri/gen/schemas/capabilities.json b/desktop/src-tauri/gen/schemas/capabilities.json
index a292161..a33a530 100644
--- a/desktop/src-tauri/gen/schemas/capabilities.json
+++ b/desktop/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"default":{"identifier":"default","description":"所有窗口的基础能力：核心 IPC（invoke/listen）+ 全局快捷键","local":true,"windows":["settings","overlay","tray","login","feedback","onboarding"],"permissions":["core:default","global-shortcut:default"]}}
\ No newline at end of file
+{"default":{"identifier":"default","description":"所有窗口的基础能力：核心 IPC（invoke/listen）+ 全局快捷键","local":true,"windows":["settings","overlay","tray","login","feedback","onboarding"],"permissions":["core:default","global-shortcut:default","core:window:allow-start-dragging"]}}
\ No newline at end of file
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index c597027..eb1fdba 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -15,17 +15,17 @@
         "label": "settings",
         "title": "dudu 设置",
         "url": "index.html",
-        "width": 472,
-        "height": 592,
+        "width": 440,
+        "height": 560,
         "resizable": false,
         "visible": false,
         "titleBarStyle": "Overlay",
         "hiddenTitle": true,
         "transparent": true,
-        "shadow": false,
+        "shadow": true,
         "trafficLightPosition": {
-          "x": 30,
-          "y": 28
+          "x": 16,
+          "y": 12
         }
       },
       {
diff --git a/desktop/src/settings/SettingsApp.jsx b/desktop/src/settings/SettingsApp.jsx
index 0525348..2beafb1 100644
--- a/desktop/src/settings/SettingsApp.jsx
+++ b/desktop/src/settings/SettingsApp.jsx
@@ -61,12 +61,13 @@ export function SettingsApp() {
   const trialUsedMin = me ? Math.floor(me.trial_used_today / 60) : 0;
 
   return (
-    // 透明窗口自绘 MacWindow 框（对齐原型）：16px 阴影边距 + radius-md + border + shadow-window。
+    // 透明窗口自绘 MacWindow 框（对齐原型）：radius-md + border-1，占满窗口，
+    // 阴影用 macOS 原生（贴合内容圆角，窗口即卡片实际尺寸）。
     // 原生 NSWindow 底色在深色内容外露白边，故窗口 transparent、框由页面画。
     <div style={{
-      fontFamily: 'var(--font-sans)', position: 'fixed', inset: 16,
+      fontFamily: 'var(--font-sans)', position: 'fixed', inset: 0,
       background: 'var(--bg-app)', borderRadius: 'var(--radius-md)',
-      border: '1px solid var(--border-1)', boxShadow: 'var(--shadow-window)',
+      border: '1px solid var(--border-1)',
       overflow: 'hidden', display: 'flex', flexDirection: 'column',
     }}>
       {/* 自绘顶条：系统红绿灯悬浮于左上（trafficLightPosition 已对齐），留 76px；整条可拖拽 */}