Merge remote-tracking branch 'github/dependabot/go_modules/github.com/ulikunitz/xz-0.5.14'

✨ Added window snapping function toggle
⬆️ Bump github.com/ulikunitz/xz from 0.5.12 to 0.5.14
2025-08-30 19:00:36 +08:00 · 2025-08-30 00:18:29 +08:00 · 2025-08-28 19:44:41 +00:00 · 2025-08-24 16:07:48 +08:00 · 2025-08-19 22:26:55 +08:00 · 2025-08-19 00:24:51 +08:00
54 changed files with 2576 additions and 1104 deletions
--- a/.cursor/rules/thxan-2-cn.mdc
+++ b/.cursor/rules/thxan-2-cn.mdc
@@ -0,0 +1,142 @@
+---
+description: THXAN-2-CN
+globs:
+alwaysApply: false
+---
+
+---
+name: AI Chief Architect (AI首席架构师)
+version: 7.3.0
+author: thxan & Gemini
+---
+
+# 核心身份 (Core Identity)
+- 你是一个顶尖的AI首席架构师，你的核心交互界面是IDE。
+- 你的首要任务是通过严谨的、文档驱动的工作流来管理和开发软件项目。
+- 你的每一次操作和决策都必须是可追溯、可审计的。
+
+# 指导原则 (Guiding Principles)
+- **首要原则：文档驱动 (Documentation-Driven)。** 整个项目以`.docs/`目录作为其单一事实来源(Single Source of Truth, SSoT)。对话是临时的，文档是永恒的。你必须通过读写文档来持久化上下文、状态和知识。
+- **第二原则：提案先行 (Proposal-First)。** 对于任何非原子性的复杂任务（如功能开发、重构），必须先生成一份结构化的提案并通过用户审批，才能进入实施阶段。
+- **第三原则：持续自省 (Continuous Introspection)。** 在完成任务后，你必须回顾流程，提炼可复用的模式，并将其固化为新的规则，以实现持续进化。
+
+# 核心机制与工具 (Core Mechanics & Tools)
+- **工具集授权:** 你被授权使用以下工具来与文件系统交互：
+    - `read_file(path)`: 读取指定文件的内容。
+    - `write_file(path, content)`: 将内容写入指定文件，会覆盖原有内容。
+    - `list_files(path)`: 列出指定目录下的文件和文件夹。
+- **状态报告协议:** 在你的每次响应结束时，**必须**附加一行来说明你的当前状态，格式为：`状态: [工作流代码][当前模块代码][子状态]`。例如: `状态: [W2][M4][AwaitingApproval]`.
+- **SSoT 结构:**
+    - **背景上下文位置:** `.docs/`
+    - **启动加载 (MUST LOAD):**
+        - **BOOTLOADER:** `.docs/README-DOCS.md`
+        - **MEMORY:** `.docs/STATE/MEMORY.md`
+        - **RULES:** `.docs/RULES/*` (所有规则文件)
+    - **按需加载 (Optional):** `.docs/*` 下的其他相关文档。
+
+---
+
+# 核心工作流 (Core Workflow)
+这是你的决策核心。你必须首先分析用户请求，并结合项目的当前状态，从以下工作流中选择一个且仅一个来执行，并**在回应的开头明确声明你选择了哪个工作流**。
+
+### **决策触发器 (Decision Triggers):**
+1.  **IF** `BOOTLOADER` 文件不存在
+    * **THEN** 激活 **[W1_ProjectInitialization]**
+2.  **ELSE IF** 用户意图涉及一个需要规划、设计和分步执行的复杂开发或修改任务 (关键词如: "实现", "开发新功能", "重构", "修改需求")
+    * **THEN** 激活 **[W2_ProposalDrivenDevelopment]**
+3.  **ELSE IF** 用户意图是一个可以直接执行的原子性任务 (关键词如: "运行测试", "画架构图", "审计文档", "检查同步")
+    * **THEN** 激活 **[W3_DirectCommandExecution]**
+4.  **ELSE** (对于所有其他情况，如请求模糊不清或前置条件不足)
+    * **THEN** 激活 **[W4_ContextClarification]**
+
+### **工作流定义 (Workflow Definitions):**
+- **[W1_ProjectInitialization]**
+    - **执行模块:** `M1_Project_Onboarding`
+- **[W2_ProposalDrivenDevelopment]**
+    - **执行模块:** `M2_Context_Loading` -> `M4_Analyze_And_Propose` -> `M5_Implement_From_Proposal` -> `M6_Sync_With_Truth` -> `M7_Review_And_Generalize`
+- **[W3_DirectCommandExecution]**
+    - **执行模块:** `M2_Context_Loading` -> (根据用户具体指令选择 `M8_Test_And_Validate`, `M9_Visualize_Architecture`, 或 `M10_Audit_Documentation` 中的一个)
+- **[W4_ContextClarification]**
+    - **执行模块:** `M2_Context_Loading` -> `M3_Clarification_And_Retry` (执行后**必须返回决策触发器**重新开始分析流程)
+
+---
+
+# 核心模块库 (Core Modules Library)
+这是你的能力单元，由上述工作流进行调用。
+
+- **`[M1_Project_Onboarding]`**: 初始化新项目，建立SSoT的基础架构。
+    - [1a] 识别为新项目，进入初始化流程。
+    - [1b] 主动提问以明确项目目标、技术栈。
+    - [1c] 创建`.docs/`目录结构及核心模板。
+    - [1d] 创建`README-DOCS.md`并建立核心“状态基线”文档初稿。
+    - [1e] 调用 `[M11_State_Management]` 初始化并保存初始状态。
+
+- **`[M2_Context_Loading]`**: 在执行任何任务前，加载必要的上下文。
+    - [2a] 调用 `[M11]` 加载当前状态。
+    - [2b] **[必须加载]:** 根据`核心机制与工具`部分的定义，加载所有启动文件。
+    - [2c] **[智能加载]:** 从用户请求中提取关键词，查找并阅读最相关的附加上下文文件。
+    - [2d] 加载完毕后，在内存中形成上下文基准，并更新状态文件。
+
+- **`[M3_Clarification_And_Retry]`**:
+    - [3a] 明确报告哪个任务无法执行，以及缺失了什么具体信息。
+    - [3b] 分析问题原因，并向用户提供一个或多个可执行的、用于解决问题的建议。
+
+- **`[M4_Analyze_And_Propose]`**:
+    - [4a] **意图分析:** 复述核心需求以确认理解。
+    - [4b] **提案驱动协议:** 对于复杂任务，生成一份结构化提案，并等待用户批准。
+        ```mermaid
+        stateDiagram-v2
+            direction LR
+            [*] --> AnalyzingIntent
+            AnalyzingIntent --> GeneratingProposal: on Complex task
+            GeneratingProposal --> AwaitingApproval
+            AwaitingApproval --> Implementing: Approved
+            AwaitingApproval --> GeneratingProposal: Rejected
+            Implementing --> SyncingSSoT
+            SyncingSSoT --> Learning
+            Learning --> [*]
+        ```
+    - [4c] **提案生成:** 调用 `[M12_Generate_File_Creation_Command]` 和 `[M13_Generate_Structured_Proposal]` 创建提案文件并起草内容，然后报告状态为 `[AwaitingApproval]`。
+
+- **`[M5_Implement_From_Proposal]`**:
+    - [5a] 读取用户指定的 `proposal_file`。
+    - [5b] **原子化执行:** 严格按文件中的清单，将“代码-文档-测试”视为不可分割的单元同步完成。
+    - [5c] **状态同步:** 每完成一步，更新提案文件（`[ ]` -> `[x]`）并调用 `[M11]` 保存进度。
+    - [5d] 完成后，自动触发 `[M6]` 和 `[M7]`。
+
+- **`[M6_Sync_With_Truth]`**:
+    - [6a] 分析最近的代码变更集，交叉比对 `.docs/STATE/` 下的基线文档。
+    - [6b] 报告 `[✅ SSoT同步完成]` 或提出 `[⚠️ 关键文档更新]` 建议。
+
+- **`[M7_Review_And_Generalize]`**:
+    - [7a] 分析任务全流程，若发现可复用的模式，主动起草新规则并提请用户批准存入 `.docs/RULES/`。
+
+- **`[M8_Test_And_Validate]`**:
+    - [8a] 分析目标文件，若测试不存在则生成测试骨架。
+    - [8b] 若测试存在，则运行相关测试脚本并报告结果。
+
+- **`[M9_Visualize_Architecture]`**:
+    - [9a] 扫描指定范围代码，识别依赖关系，并使用Mermaid.js语法生成图表。
+    - [9b] 主动询问是否需要将图表保存到 `.docs/ARCHITECTURE/`。
+
+- **`[M10_Audit_Documentation]`**:
+    - [10a] 执行交叉引用分析，生成包含 `[🚫 Missing Docs]`、`[🔗 Broken Links]`、`[⚠️ Stale Docs]`的审计报告。
+
+- **`[M11_State_Management]`**:
+    - [11a] 通过读写 `.docs/STATE/MEMORY.md` 来加载、保存或清理当前任务状态。
+
+- **`[M12_Generate_File_Creation_Command]`**:
+    - [12a] **职责:** 生成一个`bash`命令来创建一个带有标准时间戳的新文件（提案、决策等）。
+    - [12b] **格式:** `touch {base_path}/${prefix}_$(date +%Y%m%d_%H%M%S)_${description}.md`
+    - [12c] **注意:** 命令执行后需捕获并使用该文件名进行后续读写。
+
+- **`[M13_Generate_Structured_Proposal]`**:
+    - [13a] 在指定文件中生成结构化的提案草稿，包含背景、目标、设计方案、风险、测试计划等。
+
+- **`[M14_Self_Correction]`**:
+    - [14a] 当发现自身行为违反`指导原则`时自动触发。
+    - [14b] **立即停止**当前不当任务，**明确承认错误**，并引用违反的原则。
+    - [14c] **重新返回核心工作流**，以正确的流程生成回答。
+
+# **[其他]**
+	** 如果不能确认获取的时间是否正确，请使用命令行 date来获取当前时间
--- a/frontend/bindings/voidraft/internal/models/models.ts
+++ b/frontend/bindings/voidraft/internal/models/models.ts
@@ -114,11 +114,6 @@ export class AppearanceConfig {
     */
    "systemTheme": SystemThemeType;

-    /**
-     * 自定义主题配置
-     */
-    "customTheme": CustomThemeConfig;
-
    /** Creates a new AppearanceConfig instance. */
    constructor($$source: Partial<AppearanceConfig> = {}) {
        if (!("language" in $$source)) {
@@ -127,9 +122,6 @@ export class AppearanceConfig {
        if (!("systemTheme" in $$source)) {
            this["systemTheme"] = ("" as SystemThemeType);
        }
-        if (!("customTheme" in $$source)) {
-            this["customTheme"] = (new CustomThemeConfig());
-        }

        Object.assign(this, $$source);
    }
@@ -138,11 +130,7 @@ export class AppearanceConfig {
     * Creates a new AppearanceConfig instance from a string or object.
     */
    static createFrom($$source: any = {}): AppearanceConfig {
-        const $$createField2_0 = $$createType6;
        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
-        if ("customTheme" in $$parsedSource) {
-            $$parsedSource["customTheme"] = $$createField2_0($$parsedSource["customTheme"]);
-        }
        return new AppearanceConfig($$parsedSource as Partial<AppearanceConfig>);
    }
 }
@@ -201,49 +189,6 @@ export class ConfigMetadata {
    }
 }

-/**
- * CustomThemeConfig 自定义主题配置
- */
-export class CustomThemeConfig {
-    /**
-     * 深色主题配置
-     */
-    "darkTheme": ThemeColorConfig;
-
-    /**
-     * 浅色主题配置
-     */
-    "lightTheme": ThemeColorConfig;
-
-    /** Creates a new CustomThemeConfig instance. */
-    constructor($$source: Partial<CustomThemeConfig> = {}) {
-        if (!("darkTheme" in $$source)) {
-            this["darkTheme"] = (new ThemeColorConfig());
-        }
-        if (!("lightTheme" in $$source)) {
-            this["lightTheme"] = (new ThemeColorConfig());
-        }
-
-        Object.assign(this, $$source);
-    }
-
-    /**
-     * Creates a new CustomThemeConfig instance from a string or object.
-     */
-    static createFrom($$source: any = {}): CustomThemeConfig {
-        const $$createField0_0 = $$createType7;
-        const $$createField1_0 = $$createType7;
-        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
-        if ("darkTheme" in $$parsedSource) {
-            $$parsedSource["darkTheme"] = $$createField0_0($$parsedSource["darkTheme"]);
-        }
-        if ("lightTheme" in $$parsedSource) {
-            $$parsedSource["lightTheme"] = $$createField1_0($$parsedSource["lightTheme"]);
-        }
-        return new CustomThemeConfig($$parsedSource as Partial<CustomThemeConfig>);
-    }
-}
-
 /**
 * Document represents a document in the system
 */
@@ -428,7 +373,7 @@ export class Extension {
     * Creates a new Extension instance from a string or object.
     */
    static createFrom($$source: any = {}): Extension {
-        const $$createField3_0 = $$createType8;
+        const $$createField3_0 = $$createType6;
        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
        if ("config" in $$parsedSource) {
            $$parsedSource["config"] = $$createField3_0($$parsedSource["config"]);
@@ -522,6 +467,17 @@ export class GeneralConfig {
     */
    "startAtLogin": boolean;

+    /**
+     * 窗口吸附设置
+     * 是否启用窗口吸附功能
+     */
+    "enableWindowSnap": boolean;
+
+    /**
+     * 吸附距离阈值(像素)
+     */
+    "snapThreshold": number;
+
    /**
     * 全局热键设置
     * 是否启用全局热键
@@ -547,6 +503,12 @@ export class GeneralConfig {
        if (!("startAtLogin" in $$source)) {
            this["startAtLogin"] = false;
        }
+        if (!("enableWindowSnap" in $$source)) {
+            this["enableWindowSnap"] = false;
+        }
+        if (!("snapThreshold" in $$source)) {
+            this["snapThreshold"] = 0;
+        }
        if (!("enableGlobalHotkey" in $$source)) {
            this["enableGlobalHotkey"] = false;
        }
@@ -561,10 +523,10 @@ export class GeneralConfig {
     * Creates a new GeneralConfig instance from a string or object.
     */
    static createFrom($$source: any = {}): GeneralConfig {
-        const $$createField5_0 = $$createType10;
+        const $$createField7_0 = $$createType8;
        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
        if ("globalHotkey" in $$parsedSource) {
-            $$parsedSource["globalHotkey"] = $$createField5_0($$parsedSource["globalHotkey"]);
+            $$parsedSource["globalHotkey"] = $$createField7_0($$parsedSource["globalHotkey"]);
        }
        return new GeneralConfig($$parsedSource as Partial<GeneralConfig>);
    }
@@ -1171,6 +1133,58 @@ export enum TabType {
    TabTypeTab = "tab",
 };

+/**
+ * Theme 主题数据库模型
+ */
+export class Theme {
+    "id": number;
+    "name": string;
+    "type": ThemeType;
+    "colors": ThemeColorConfig;
+    "isDefault": boolean;
+    "createdAt": time$0.Time;
+    "updatedAt": time$0.Time;
+
+    /** Creates a new Theme instance. */
+    constructor($$source: Partial<Theme> = {}) {
+        if (!("id" in $$source)) {
+            this["id"] = 0;
+        }
+        if (!("name" in $$source)) {
+            this["name"] = "";
+        }
+        if (!("type" in $$source)) {
+            this["type"] = ("" as ThemeType);
+        }
+        if (!("colors" in $$source)) {
+            this["colors"] = (new ThemeColorConfig());
+        }
+        if (!("isDefault" in $$source)) {
+            this["isDefault"] = false;
+        }
+        if (!("createdAt" in $$source)) {
+            this["createdAt"] = null;
+        }
+        if (!("updatedAt" in $$source)) {
+            this["updatedAt"] = null;
+        }
+
+        Object.assign(this, $$source);
+    }
+
+    /**
+     * Creates a new Theme instance from a string or object.
+     */
+    static createFrom($$source: any = {}): Theme {
+        const $$createField3_0 = $$createType9;
+        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
+        if ("colors" in $$parsedSource) {
+            $$parsedSource["colors"] = $$createField3_0($$parsedSource["colors"]);
+        }
+        return new Theme($$parsedSource as Partial<Theme>);
+    }
+}
+
 /**
 * ThemeColorConfig 主题颜色配置
 */
@@ -1379,6 +1393,19 @@ export class ThemeColorConfig {
    }
 }

+/**
+ * ThemeType 主题类型枚举
+ */
+export enum ThemeType {
+    /**
+     * The Go zero value for the underlying type of the enum.
+     */
+    $zero = "",
+
+    ThemeTypeDark = "dark",
+    ThemeTypeLight = "light",
+};
+
 /**
 * UpdateSourceType 更新源类型
 */
@@ -1477,8 +1504,8 @@ export class UpdatesConfig {
     * Creates a new UpdatesConfig instance from a string or object.
     */
    static createFrom($$source: any = {}): UpdatesConfig {
-        const $$createField6_0 = $$createType11;
-        const $$createField7_0 = $$createType12;
+        const $$createField6_0 = $$createType10;
+        const $$createField7_0 = $$createType11;
        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
        if ("github" in $$parsedSource) {
            $$parsedSource["github"] = $$createField6_0($$parsedSource["github"]);
@@ -1497,15 +1524,14 @@ const $$createType2 = AppearanceConfig.createFrom;
 const $$createType3 = UpdatesConfig.createFrom;
 const $$createType4 = GitBackupConfig.createFrom;
 const $$createType5 = ConfigMetadata.createFrom;
-const $$createType6 = CustomThemeConfig.createFrom;
-const $$createType7 = ThemeColorConfig.createFrom;
-var $$createType8 = (function $$initCreateType8(...args): any {
-    if ($$createType8 === $$initCreateType8) {
-        $$createType8 = $$createType9;
+var $$createType6 = (function $$initCreateType6(...args): any {
+    if ($$createType6 === $$initCreateType6) {
+        $$createType6 = $$createType7;
    }
-    return $$createType8(...args);
+    return $$createType6(...args);
 });
-const $$createType9 = $Create.Map($Create.Any, $Create.Any);
-const $$createType10 = HotkeyCombo.createFrom;
-const $$createType11 = GithubConfig.createFrom;
-const $$createType12 = GiteaConfig.createFrom;
+const $$createType7 = $Create.Map($Create.Any, $Create.Any);
+const $$createType8 = HotkeyCombo.createFrom;
+const $$createType9 = ThemeColorConfig.createFrom;
+const $$createType10 = GithubConfig.createFrom;
+const $$createType11 = GiteaConfig.createFrom;
--- a/frontend/bindings/voidraft/internal/services/configservice.ts
+++ b/frontend/bindings/voidraft/internal/services/configservice.ts
@@ -82,6 +82,14 @@ export function SetHotkeyChangeCallback(callback: any): Promise<void> & { cancel
    return $resultPromise;
 }

+/**
+ * SetWindowSnapConfigChangeCallback 设置窗口吸附配置变更回调
+ */
+export function SetWindowSnapConfigChangeCallback(callback: any): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2324961653, callback) as any;
+    return $resultPromise;
+}
+
 // Private type creation functions
 const $$createType0 = models$0.AppConfig.createFrom;
 const $$createType1 = $Create.Nullable($$createType0);
--- a/frontend/bindings/voidraft/internal/services/hotkeyservice.ts
+++ b/frontend/bindings/voidraft/internal/services/hotkeyservice.ts
@@ -32,8 +32,8 @@ export function GetCurrentHotkey(): Promise<models$0.HotkeyCombo | null> & { can
 /**
 * Initialize 初始化热键服务
 */
-export function Initialize(app: application$0.App | null): Promise<void> & { cancel(): void } {
-    let $resultPromise = $Call.ByID(3671360458, app) as any;
+export function Initialize(app: application$0.App | null, mainWindow: application$0.WebviewWindow | null): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(3671360458, app, mainWindow) as any;
    return $resultPromise;
 }

--- a/frontend/bindings/voidraft/internal/services/index.ts
+++ b/frontend/bindings/voidraft/internal/services/index.ts
@@ -13,9 +13,11 @@ import * as MigrationService from "./migrationservice.js";
 import * as SelfUpdateService from "./selfupdateservice.js";
 import * as StartupService from "./startupservice.js";
 import * as SystemService from "./systemservice.js";
+import * as ThemeService from "./themeservice.js";
 import * as TranslationService from "./translationservice.js";
 import * as TrayService from "./trayservice.js";
 import * as WindowService from "./windowservice.js";
+import * as WindowSnapService from "./windowsnapservice.js";
 export {
    BackupService,
    ConfigService,
@@ -29,9 +31,11 @@ export {
    SelfUpdateService,
    StartupService,
    SystemService,
+    ThemeService,
    TranslationService,
    TrayService,
-    WindowService
+    WindowService,
+    WindowSnapService
 };

 export * from "./models.js";
--- a/frontend/bindings/voidraft/internal/services/models.ts
+++ b/frontend/bindings/voidraft/internal/services/models.ts
@@ -203,7 +203,7 @@ export class SelfUpdateResult {
 }

 /**
- * WindowInfo 窗口信息
+ * WindowInfo 窗口信息（简化版）
 */
 export class WindowInfo {
    "Window": application$0.WebviewWindow | null;
@@ -238,6 +238,26 @@ export class WindowInfo {
    }
 }

+/**
+ * WindowSnapService 窗口吸附服务
+ */
+export class WindowSnapService {
+
+    /** Creates a new WindowSnapService instance. */
+    constructor($$source: Partial<WindowSnapService> = {}) {
+
+        Object.assign(this, $$source);
+    }
+
+    /**
+     * Creates a new WindowSnapService instance from a string or object.
+     */
+    static createFrom($$source: any = {}): WindowSnapService {
+        let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
+        return new WindowSnapService($$parsedSource as Partial<WindowSnapService>);
+    }
+}
+
 // Private type creation functions
 const $$createType0 = application$0.WebviewWindow.createFrom;
 const $$createType1 = $Create.Nullable($$createType0);
--- a/frontend/bindings/voidraft/internal/services/themeservice.ts
+++ b/frontend/bindings/voidraft/internal/services/themeservice.ts
@@ -0,0 +1,104 @@
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+
+/**
+ * ThemeService 主题服务
+ * @module
+ */
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore: Unused imports
+import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore: Unused imports
+import * as application$0 from "../../../github.com/wailsapp/wails/v3/pkg/application/models.js";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore: Unused imports
+import * as models$0 from "../models/models.js";
+
+/**
+ * CreateTheme 创建新主题
+ */
+export function CreateTheme(theme: models$0.Theme | null): Promise<models$0.Theme | null> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(3274757686, theme) as any;
+    let $typingPromise = $resultPromise.then(($result: any) => {
+        return $$createType1($result);
+    }) as any;
+    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
+    return $typingPromise;
+}
+
+/**
+ * GetAllThemes 获取所有主题
+ */
+export function GetAllThemes(): Promise<(models$0.Theme | null)[]> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2425053076) as any;
+    let $typingPromise = $resultPromise.then(($result: any) => {
+        return $$createType2($result);
+    }) as any;
+    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
+    return $typingPromise;
+}
+
+/**
+ * GetDefaultThemes 获取默认主题
+ */
+export function GetDefaultThemes(): Promise<{ [_: string]: models$0.Theme | null }> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(3801788118) as any;
+    let $typingPromise = $resultPromise.then(($result: any) => {
+        return $$createType3($result);
+    }) as any;
+    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
+    return $typingPromise;
+}
+
+/**
+ * GetThemeByType 根据类型获取默认主题
+ */
+export function GetThemeByType(themeType: models$0.ThemeType): Promise<models$0.Theme | null> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(1680465265, themeType) as any;
+    let $typingPromise = $resultPromise.then(($result: any) => {
+        return $$createType1($result);
+    }) as any;
+    $typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
+    return $typingPromise;
+}
+
+/**
+ * ResetThemeColors 重置主题颜色为默认值
+ */
+export function ResetThemeColors(themeType: models$0.ThemeType): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(342461245, themeType) as any;
+    return $resultPromise;
+}
+
+/**
+ * ServiceShutdown 服务关闭
+ */
+export function ServiceShutdown(): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(1676749034) as any;
+    return $resultPromise;
+}
+
+/**
+ * ServiceStartup 服务启动时初始化
+ */
+export function ServiceStartup(options: application$0.ServiceOptions): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2915959937, options) as any;
+    return $resultPromise;
+}
+
+/**
+ * UpdateThemeColors 更新主题颜色
+ */
+export function UpdateThemeColors(themeType: models$0.ThemeType, colors: models$0.ThemeColorConfig): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2750902529, themeType, colors) as any;
+    return $resultPromise;
+}
+
+// Private type creation functions
+const $$createType0 = models$0.Theme.createFrom;
+const $$createType1 = $Create.Nullable($$createType0);
+const $$createType2 = $Create.Array($$createType1);
+const $$createType3 = $Create.Map($Create.Any, $$createType1);
--- a/frontend/bindings/voidraft/internal/services/windowservice.ts
+++ b/frontend/bindings/voidraft/internal/services/windowservice.ts
@@ -2,7 +2,7 @@
 // This file is automatically generated. DO NOT EDIT

 /**
- * WindowService 窗口管理服务
+ * WindowService 窗口管理服务（专注于窗口生命周期管理）
 * @module
 */

@@ -46,6 +46,14 @@ export function OpenDocumentWindow(documentID: number): Promise<void> & { cancel
    return $resultPromise;
 }

+/**
+ * ServiceShutdown 实现服务关闭接口
+ */
+export function ServiceShutdown(): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(202192783) as any;
+    return $resultPromise;
+}
+
 /**
 * SetAppReferences 设置应用和主窗口引用
 */
@@ -54,6 +62,14 @@ export function SetAppReferences(app: application$0.App | null, mainWindow: appl
    return $resultPromise;
 }

+/**
+ * SetWindowSnapService 设置窗口吸附服务引用
+ */
+export function SetWindowSnapService(snapService: $models.WindowSnapService | null): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(1105193745, snapService) as any;
+    return $resultPromise;
+}
+
 // Private type creation functions
 const $$createType0 = $models.WindowInfo.createFrom;
 const $$createType1 = $Create.Array($$createType0);
--- a/frontend/bindings/voidraft/internal/services/windowsnapservice.ts
+++ b/frontend/bindings/voidraft/internal/services/windowsnapservice.ts
@@ -0,0 +1,87 @@
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+
+/**
+ * WindowSnapService 窗口吸附服务
+ * @module
+ */
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore: Unused imports
+import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore: Unused imports
+import * as application$0 from "../../../github.com/wailsapp/wails/v3/pkg/application/models.js";
+
+/**
+ * Cleanup 清理资源
+ */
+export function Cleanup(): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2155505498) as any;
+    return $resultPromise;
+}
+
+/**
+ * OnWindowSnapConfigChanged 处理窗口吸附配置变更
+ */
+export function OnWindowSnapConfigChanged(enabled: boolean, threshold: number): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(3794787039, enabled, threshold) as any;
+    return $resultPromise;
+}
+
+/**
+ * RegisterWindow 注册需要吸附管理的窗口
+ */
+export function RegisterWindow(documentID: number, window: application$0.WebviewWindow | null, title: string): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(1000222723, documentID, window, title) as any;
+    return $resultPromise;
+}
+
+/**
+ * ServiceShutdown 实现服务关闭接口
+ */
+export function ServiceShutdown(): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(1172710495) as any;
+    return $resultPromise;
+}
+
+/**
+ * SetAppReferences 设置应用和主窗口引用
+ */
+export function SetAppReferences(app: application$0.App | null, mainWindow: application$0.WebviewWindow | null): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(1782093351, app, mainWindow) as any;
+    return $resultPromise;
+}
+
+/**
+ * SetSnapEnabled 设置是否启用窗口吸附
+ */
+export function SetSnapEnabled(enabled: boolean): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2280126835, enabled) as any;
+    return $resultPromise;
+}
+
+/**
+ * SetSnapThreshold 设置窗口吸附阈值
+ */
+export function SetSnapThreshold(threshold: number): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(586790049, threshold) as any;
+    return $resultPromise;
+}
+
+/**
+ * StartWindowSnapMonitor 启动窗口吸附监听器
+ */
+export function StartWindowSnapMonitor(): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(84533508) as any;
+    return $resultPromise;
+}
+
+/**
+ * UnregisterWindow 取消注册窗口
+ */
+export function UnregisterWindow(documentID: number): Promise<void> & { cancel(): void } {
+    let $resultPromise = $Call.ByID(2844230768, documentID) as any;
+    return $resultPromise;
+}
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,18 +24,18 @@
    "@codemirror/lang-json": "^6.0.2",
    "@codemirror/lang-less": "^6.0.2",
    "@codemirror/lang-lezer": "^6.0.2",
-    "@codemirror/lang-liquid": "^6.2.3",
-    "@codemirror/lang-markdown": "^6.3.3",
+    "@codemirror/lang-liquid": "^6.3.0",
+    "@codemirror/lang-markdown": "^6.3.4",
    "@codemirror/lang-php": "^6.0.2",
    "@codemirror/lang-python": "^6.2.1",
    "@codemirror/lang-rust": "^6.0.2",
    "@codemirror/lang-sass": "^6.0.2",
-    "@codemirror/lang-sql": "^6.9.0",
+    "@codemirror/lang-sql": "^6.9.1",
    "@codemirror/lang-vue": "^0.1.3",
    "@codemirror/lang-wast": "^6.0.2",
    "@codemirror/lang-xml": "^6.1.0",
    "@codemirror/lang-yaml": "^6.1.2",
-    "@codemirror/language": "^6.11.2",
+    "@codemirror/language": "^6.11.3",
    "@codemirror/language-data": "^6.5.1",
    "@codemirror/legacy-modes": "^6.5.1",
    "@codemirror/lint": "^6.8.5",
@@ -52,30 +52,30 @@
    "hsl-matcher": "^1.2.4",
    "lezer": "^0.13.5",
    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.4.1",
+    "pinia-plugin-persistedstate": "^4.5.0",
    "prettier": "^3.6.2",
    "remarkable": "^2.0.1",
-    "sass": "^1.89.2",
-    "vue": "^3.5.17",
-    "vue-i18n": "^11.1.10",
+    "sass": "^1.90.0",
+    "vue": "^3.5.19",
+    "vue-i18n": "^11.1.11",
    "vue-pick-colors": "^1.8.0",
    "vue-router": "^4.5.1"
  },
  "devDependencies": {
-    "@eslint/js": "^9.31.0",
+    "@eslint/js": "^9.34.0",
    "@lezer/generator": "^1.8.0",
-    "@types/node": "^24.0.14",
+    "@types/node": "^24.3.0",
    "@types/remarkable": "^2.0.8",
-    "@vitejs/plugin-vue": "^6.0.0",
+    "@vitejs/plugin-vue": "^6.0.1",
    "@wailsio/runtime": "latest",
-    "eslint": "^9.31.0",
-    "eslint-plugin-vue": "^10.3.0",
+    "eslint": "^9.34.0",
+    "eslint-plugin-vue": "^10.4.0",
    "globals": "^16.3.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.37.0",
-    "unplugin-vue-components": "^28.8.0",
-    "vite": "^7.0.4",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.40.0",
+    "unplugin-vue-components": "^29.0.0",
+    "vite": "^7.1.3",
    "vue-eslint-parser": "^10.2.0",
-    "vue-tsc": "^3.0.1"
+    "vue-tsc": "^3.0.6"
  }
 }
--- a/frontend/src/components/titlebar/LinuxTitleBar.vue
+++ b/frontend/src/components/titlebar/LinuxTitleBar.vue
@@ -2,26 +2,26 @@
  <div class="linux-titlebar" style="--wails-draggable:drag" @contextmenu.prevent>
    <div class="titlebar-content" @dblclick="toggleMaximize" @contextmenu.prevent>
      <div class="titlebar-icon">
-        <img src="/appicon.png" alt="voidraft" />
+        <img src="/appicon.png" alt="voidraft"/>
      </div>
      <div class="titlebar-title">{{ titleText }}</div>
    </div>
-    
+
    <div class="titlebar-controls" style="--wails-draggable:no-drag" @contextmenu.prevent>
-      <button 
-        class="titlebar-button minimize-button" 
-        @click="minimizeWindow"
-        :title="t('titlebar.minimize')"
+      <button
+          class="titlebar-button minimize-button"
+          @click="minimizeWindow"
+          :title="t('titlebar.minimize')"
      >
        <svg width="16" height="16" viewBox="0 0 16 16">
          <path d="M4 8h8" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
        </svg>
      </button>
-      
-      <button 
-        class="titlebar-button maximize-button" 
-        @click="toggleMaximize"
-        :title="isMaximized ? t('titlebar.restore') : t('titlebar.maximize')"
+
+      <button
+          class="titlebar-button maximize-button"
+          @click="toggleMaximize"
+          :title="isMaximized ? t('titlebar.restore') : t('titlebar.maximize')"
      >
        <svg width="16" height="16" viewBox="0 0 16 16" v-if="!isMaximized">
          <rect x="4" y="4" width="8" height="8" fill="none" stroke="currentColor" stroke-width="2"/>
@@ -31,11 +31,11 @@
          <rect x="7" y="3" width="6" height="6" fill="none" stroke="currentColor" stroke-width="1.5"/>
        </svg>
      </button>
-      
-      <button 
-        class="titlebar-button close-button" 
-        @click="closeWindow"
-        :title="t('titlebar.close')"
+
+      <button
+          class="titlebar-button close-button"
+          @click="closeWindow"
+          :title="t('titlebar.close')"
      >
        <svg width="16" height="16" viewBox="0 0 16 16">
          <path d="M4 4l8 8m0-8L4 12" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
@@ -46,85 +46,56 @@
 </template>

 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
+import {computed, onMounted, ref} from 'vue';
+import {useI18n} from 'vue-i18n';
 import * as runtime from '@wailsio/runtime';
-import { useWindowStore } from '@/stores/windowStore';
-import { useDocumentStore } from '@/stores/documentStore';
+import {useDocumentStore} from '@/stores/documentStore';

-const { t } = useI18n();
+const {t} = useI18n();
 const isMaximized = ref(false);
 const documentStore = useDocumentStore();

-const minimizeWindow = async () => {
-  try {
-    await runtime.Window.Minimise();
-  } catch (error) {
-    // Error handling
-  }
-};
-
-const toggleMaximize = async () => {
-  try {
-    const newState = !isMaximized.value;
-    isMaximized.value = newState;
-    
-    if (newState) {
-      await runtime.Window.Maximise();
-    } else {
-      await runtime.Window.UnMaximise();
-    }
-    
-    setTimeout(async () => {
-      await checkMaximizedState();
-    }, 100);
-  } catch (error) {
-    isMaximized.value = !isMaximized.value;
-  }
-};
-
-const closeWindow = async () => {
-  try {
-    await runtime.Window.Close();
-  } catch (error) {
-    // Error handling
-  }
-};
-
-const checkMaximizedState = async () => {
-  try {
-    isMaximized.value = await runtime.Window.IsMaximised();
-  } catch (error) {
-    // Error handling
-  }
-};
-
 // 计算标题文本
 const titleText = computed(() => {
  const currentDoc = documentStore.currentDocument;
  return currentDoc ? `voidraft - ${currentDoc.title}` : 'voidraft';
 });

+const minimizeWindow = async () => {
+  try {
+    await runtime.Window.Minimise();
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const toggleMaximize = async () => {
+  try {
+    await runtime.Window.ToggleMaximise();
+    await checkMaximizedState();
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const closeWindow = async () => {
+  try {
+    await runtime.Window.Close();
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const checkMaximizedState = async () => {
+  try {
+    isMaximized.value = await runtime.Window.IsMaximised();
+  } catch (error) {
+    console.error(error);
+  }
+};
+
 onMounted(async () => {
  await checkMaximizedState();
-  
-  runtime.Events.On('window:maximised', () => {
-    isMaximized.value = true;
-  });
-  
-  runtime.Events.On('window:unmaximised', () => {
-    isMaximized.value = false;
-  });
-
-  runtime.Events.On('window:focus', async () => {
-    await checkMaximizedState();
-  });
-
-});
-onUnmounted(() => {
-  runtime.Events.Off('window:maximised');
-  runtime.Events.Off('window:unmaximised');
-  runtime.Events.Off('window:focus');
 });
 </script>

@@ -139,7 +110,7 @@ onUnmounted(() => {
  width: 100%;
  font-family: 'Ubuntu', 'Cantarell', 'DejaVu Sans', system-ui, sans-serif;
  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  
+
  -webkit-context-menu: none;
  -moz-context-menu: none;
  context-menu: none;
@@ -155,7 +126,7 @@ onUnmounted(() => {
  font-size: 13px;
  font-weight: 500;
  cursor: default;
-  
+
  -webkit-context-menu: none;
  -moz-context-menu: none;
  context-menu: none;
@@ -164,7 +135,7 @@ onUnmounted(() => {
 .titlebar-content .titlebar-icon {
  width: 16px;
  height: 16px;
-  
+
  img {
    width: 100%;
    height: 100%;
@@ -181,7 +152,7 @@ onUnmounted(() => {
 .titlebar-controls {
  display: flex;
  height: 100%;
-  
+
  -webkit-context-menu: none;
  -moz-context-menu: none;
  context-menu: none;
@@ -201,22 +172,22 @@ onUnmounted(() => {
  padding: 0;
  margin: 0;
  border-radius: 0;
-  
+
  svg {
    width: 16px;
    height: 16px;
    opacity: 0.8;
    transition: opacity 0.15s ease;
  }
-  
+
  &:hover {
    background: var(--toolbar-button-hover, rgba(0, 0, 0, 0.1));
-    
+
    svg {
      opacity: 1;
    }
  }
-  
+
  &:active {
    background: var(--toolbar-button-active, rgba(0, 0, 0, 0.15));
  }
@@ -226,12 +197,12 @@ onUnmounted(() => {
  &:hover {
    background: #e74c3c;
    color: #ffffff;
-    
+
    svg {
      opacity: 1;
    }
  }
-  
+
  &:active {
    background: #c0392b;
  }
@@ -244,19 +215,19 @@ onUnmounted(() => {
    border-bottom-color: var(--toolbar-border, #1e1e1e);
    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
  }
-  
+
  .titlebar-content,
  .titlebar-title {
    color: var(--toolbar-text, #f0f0f0);
  }
-  
+
  .titlebar-button {
    color: var(--toolbar-text, #ccc);
-    
+
    &:hover {
      background: var(--toolbar-button-hover, rgba(255, 255, 255, 0.1));
    }
-    
+
    &:active {
      background: var(--toolbar-button-active, rgba(255, 255, 255, 0.15));
    }
@@ -267,13 +238,13 @@ onUnmounted(() => {
 .linux-titlebar.gnome-style {
  height: 38px;
  border-radius: 12px 12px 0 0;
-  
+
  .titlebar-button {
    height: 38px;
    width: 32px;
    border-radius: 6px;
    margin: 3px 2px;
-    
+
    &:hover {
      background: rgba(255, 255, 255, 0.1);
    }
@@ -284,11 +255,11 @@ onUnmounted(() => {
 .linux-titlebar.kde-style {
  background: var(--toolbar-bg, #eff0f1);
  border-bottom: 1px solid var(--toolbar-border, #bdc3c7);
-  
+
  .titlebar-button {
    border-radius: 4px;
    margin: 2px 1px;
-    
+
    &:hover {
      background: rgba(61, 174, 233, 0.2);
    }
--- a/frontend/src/components/titlebar/MacOSTitleBar.vue
+++ b/frontend/src/components/titlebar/MacOSTitleBar.vue
@@ -53,7 +53,6 @@
 import { ref, onMounted, onUnmounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import * as runtime from '@wailsio/runtime';
-import { useWindowStore } from '@/stores/windowStore';
 import { useDocumentStore } from '@/stores/documentStore';

 const { t } = useI18n();
@@ -65,26 +64,16 @@ const minimizeWindow = async () => {
  try {
    await runtime.Window.Minimise();
  } catch (error) {
-    // Error handling
+    console.error(error)
  }
 };

 const toggleMaximize = async () => {
  try {
-    const newState = !isMaximized.value;
-    isMaximized.value = newState;
-    
-    if (newState) {
-      await runtime.Window.Maximise();
-    } else {
-      await runtime.Window.UnMaximise();
-    }
-    
-    setTimeout(async () => {
-      await checkMaximizedState();
-    }, 100);
+    await runtime.Window.ToggleMaximise();
+    await checkMaximizedState();
  } catch (error) {
-    isMaximized.value = !isMaximized.value;
+    console.error(error)
  }
 };

@@ -92,7 +81,7 @@ const closeWindow = async () => {
  try {
    await runtime.Window.Close();
  } catch (error) {
-    // Error handling
+    console.error(error)
  }
 };

@@ -100,7 +89,7 @@ const checkMaximizedState = async () => {
  try {
    isMaximized.value = await runtime.Window.IsMaximised();
  } catch (error) {
-    // Error handling
+    console.error(error)
  }
 };

@@ -112,24 +101,6 @@ const titleText = computed(() => {

 onMounted(async () => {
  await checkMaximizedState();
-  
-  runtime.Events.On('window:maximised', () => {
-    isMaximized.value = true;
-  });
-  
-  runtime.Events.On('window:unmaximised', () => {
-    isMaximized.value = false;
-  });
-
-  runtime.Events.On('window:focus', async () => {
-    await checkMaximizedState();
-  });
-
-});
-onUnmounted(() => {
-  runtime.Events.Off('window:maximised');
-  runtime.Events.Off('window:unmaximised');
-  runtime.Events.Off('window:focus');
 });
 </script>

--- a/frontend/src/components/titlebar/WindowsTitleBar.vue
+++ b/frontend/src/components/titlebar/WindowsTitleBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="windows-titlebar" style="--wails-draggable:drag" @contextmenu.prevent>
+  <div class="windows-titlebar" style="--wails-draggable:drag">
    <div class="titlebar-content" @dblclick="toggleMaximize" @contextmenu.prevent>
      <div class="titlebar-icon">
        <img src="/appicon.png" alt="voidraft"/>
@@ -36,11 +36,10 @@
 </template>

 <script setup lang="ts">
-import {computed, onMounted, onUnmounted, ref} from 'vue';
+import {computed, onMounted, ref} from 'vue';
 import {useI18n} from 'vue-i18n';
 import * as runtime from '@wailsio/runtime';
-import { useWindowStore } from '@/stores/windowStore';
-import { useDocumentStore } from '@/stores/documentStore';
+import {useDocumentStore} from '@/stores/documentStore';

 const {t} = useI18n();
 const isMaximized = ref(false);
@@ -59,30 +58,16 @@ const minimizeWindow = async () => {
  try {
    await runtime.Window.Minimise();
  } catch (error) {
-    // Error handling
+    console.error(error);
  }
 };

 const toggleMaximize = async () => {
  try {
-    // 立即更新UI状态，提供即时反馈
-    const newState = !isMaximized.value;
-    isMaximized.value = newState;
-
-    // 然后执行实际操作
-    if (newState) {
-      await runtime.Window.Maximise();
-    } else {
-      await runtime.Window.UnMaximise();
-    }
-
-    // 操作完成后再次确认状态（防止操作失败时状态不一致）
-    setTimeout(async () => {
-      await checkMaximizedState();
-    }, 100);
+    await runtime.Window.ToggleMaximise();
+    await checkMaximizedState();
  } catch (error) {
-    // 如果操作失败，恢复原状态
-    isMaximized.value = !isMaximized.value;
+    console.error(error);
  }
 };

@@ -90,7 +75,7 @@ const closeWindow = async () => {
  try {
    await runtime.Window.Close();
  } catch (error) {
-    // Error handling
+    console.error(error);
  }
 };

@@ -98,31 +83,12 @@ const checkMaximizedState = async () => {
  try {
    isMaximized.value = await runtime.Window.IsMaximised();
  } catch (error) {
-    // Error handling
+    console.error(error);
  }
 };

 onMounted(async () => {
  await checkMaximizedState();
-
-  runtime.Events.On('window:maximised', () => {
-    isMaximized.value = true;
-  });
-
-  runtime.Events.On('window:unmaximised', () => {
-    isMaximized.value = false;
-  });
-
-  runtime.Events.On('window:focus', async () => {
-    await checkMaximizedState();
-  });
-
-});
-
-onUnmounted(() => {
-  runtime.Events.Off('window:maximised');
-  runtime.Events.Off('window:unmaximised');
-  runtime.Events.Off('window:focus');
 });
 </script>

--- a/frontend/src/components/toolbar/DocumentSelector.vue
+++ b/frontend/src/components/toolbar/DocumentSelector.vue
@@ -107,6 +107,12 @@ const selectItem = async (item: any) => {
 // 选择文档
 const selectDoc = async (doc: Document) => {
  try {
+    // 如果选择的就是当前文档，直接关闭菜单
+    if (documentStore.currentDocument?.id === doc.id) {
+      closeMenu();
+      return;
+    }
+
    const hasOpen = await windowStore.isDocumentWindowOpen(doc.id);
    if (hasOpen) {
      // 设置错误状态并启动定时器
@@ -208,7 +214,7 @@ const openInNewWindow = async (doc: Document, event: Event) => {
  }
 };

-// 处理删除 - 简化确认机制
+// 处理删除
 const handleDelete = async (doc: Document, event: Event) => {
  event.stopPropagation();

@@ -236,9 +242,13 @@ const handleDelete = async (doc: Document, event: Event) => {
        return;
      }
      
-      await documentStore.deleteDocument(doc.id);
-      await documentStore.updateDocuments();
+      const deleteSuccess = await documentStore.deleteDocument(doc.id);

+      if (!deleteSuccess) {
+        return;
+      }
+      
+      await documentStore.updateDocuments();
      // 如果删除的是当前文档，切换到第一个文档
      if (documentStore.currentDocument?.id === doc.id && documentStore.documentList.length > 0) {
        const firstDoc = documentStore.documentList[0];
--- a/frontend/src/i18n/locales/en-US.ts
+++ b/frontend/src/i18n/locales/en-US.ts
@@ -134,6 +134,7 @@ export default {
    showInSystemTray: 'Show in System Tray',
    enableSystemTray: 'Enable System Tray',
    alwaysOnTop: 'Always on Top',
+    enableWindowSnap: 'Enable Window Snapping',
    startup: 'Startup Settings',
    startAtLogin: 'Start at Login',
    dataStorage: 'Data Storage',
--- a/frontend/src/i18n/locales/zh-CN.ts
+++ b/frontend/src/i18n/locales/zh-CN.ts
@@ -135,6 +135,7 @@ export default {
    showInSystemTray: '在系统托盘中显示',
    enableSystemTray: '启用系统托盘',
    alwaysOnTop: '窗口始终置顶',
+    enableWindowSnap: '启用窗口吸附',
    startup: '启动设置',
    startAtLogin: '开机自启动',
    dataStorage: '数据存储',
--- a/frontend/src/stores/configStore.ts
+++ b/frontend/src/stores/configStore.ts
@@ -16,9 +16,7 @@ import {
 } from '@/../bindings/voidraft/internal/models/models';
 import {useI18n} from 'vue-i18n';
 import {ConfigUtils} from '@/utils/configUtils';
-import {WindowController} from '@/utils/windowController';
 import * as runtime from '@wailsio/runtime';
-import {useBackupStore} from '@/stores/backupStore';
 // 国际化相关导入
 export type SupportedLocaleType = 'zh-CN' | 'en-US';

@@ -64,7 +62,9 @@ const GENERAL_CONFIG_KEY_MAP: GeneralConfigKeyMap = {
    enableSystemTray: 'general.enableSystemTray',
    startAtLogin: 'general.startAtLogin',
    enableGlobalHotkey: 'general.enableGlobalHotkey',
-    globalHotkey: 'general.globalHotkey'
+    globalHotkey: 'general.globalHotkey',
+    enableWindowSnap: 'general.enableWindowSnap',
+    snapThreshold: 'general.snapThreshold'
 } as const;

 const EDITING_CONFIG_KEY_MAP: EditingConfigKeyMap = {
@@ -80,8 +80,7 @@ const EDITING_CONFIG_KEY_MAP: EditingConfigKeyMap = {

 const APPEARANCE_CONFIG_KEY_MAP: AppearanceConfigKeyMap = {
    language: 'appearance.language',
-    systemTheme: 'appearance.systemTheme',
-    customTheme: 'appearance.customTheme'
+    systemTheme: 'appearance.systemTheme'
 } as const;

 const UPDATES_CONFIG_KEY_MAP: UpdatesConfigKeyMap = {
@@ -179,7 +178,9 @@ const DEFAULT_CONFIG: AppConfig = {
            alt: true,
            win: false,
            key: 'X'
-        }
+        },
+        enableWindowSnap: true,
+        snapThreshold: 15
    },
    editing: {
        fontSize: CONFIG_LIMITS.fontSize.default,
@@ -191,80 +192,10 @@ const DEFAULT_CONFIG: AppConfig = {
        tabType: CONFIG_LIMITS.tabType.default,
        autoSaveDelay: 5000
    },
-    appearance: {
-        language: LanguageType.LangZhCN,
-        systemTheme: SystemThemeType.SystemThemeAuto,
-        customTheme: {
-            darkTheme: {
-                // 基础色调
-                background: '#252B37',
-                backgroundSecondary: '#213644',
-                surface: '#474747',
-                foreground: '#9BB586',
-                foregroundSecondary: '#9c9c9c',
-                
-                // 语法高亮
-                comment: '#6272a4',
-                keyword: '#ff79c6',
-                string: '#f1fa8c',
-                function: '#50fa7b',
-                number: '#bd93f9',
-                operator: '#ff79c6',
-                variable: '#8fbcbb',
-                type: '#8be9fd',
-                
-                // 界面元素
-                cursor: '#fff',
-                selection: '#0865a9aa',
-                selectionBlur: '#225377aa',
-                activeLine: 'rgba(255,255,255,0.04)',
-                lineNumber: 'rgba(255,255,255, 0.15)',
-                activeLineNumber: 'rgba(255,255,255, 0.6)',
-                
-                // 边框分割线
-                borderColor: '#1e222a',
-                borderLight: 'rgba(255,255,255, 0.1)',
-                
-                // 搜索匹配
-                searchMatch: '#8fbcbb',
-                matchingBracket: 'rgba(255,255,255,0.1)'
-            },
-            lightTheme: {
-                // 基础色调
-                background: '#ffffff',
-                backgroundSecondary: '#f1faf1',
-                surface: '#f5f5f5',
-                foreground: '#444d56',
-                foregroundSecondary: '#6a737d',
-                
-                // 语法高亮
-                comment: '#6a737d',
-                keyword: '#d73a49',
-                string: '#032f62',
-                function: '#005cc5',
-                number: '#005cc5',
-                operator: '#d73a49',
-                variable: '#24292e',
-                type: '#6f42c1',
-                
-                // 界面元素
-                cursor: '#000',
-                selection: '#77baff8c',
-                selectionBlur: '#b2c2ca85',
-                activeLine: '#000000',
-                lineNumber: '#000000',
-                activeLineNumber: '#000000',
-                
-                // 边框分割线
-                borderColor: '#dfdfdf',
-                borderLight: '#0000000C',
-                
-                // 搜索匹配
-                searchMatch: '#005cc5',
-                matchingBracket: 'rgba(0,0,0,0.1)'
-            }
-        }
-    },
+            appearance: {
+            language: LanguageType.LangZhCN,
+            systemTheme: SystemThemeType.SystemThemeAuto
+        },
    updates: {
        version: "1.0.0",
        autoUpdate: true,
@@ -416,9 +347,6 @@ export const useConfigStore = defineStore('config', () => {

            state.configLoaded = true;

-            // 初始化热键监听器
-            const windowController = WindowController.getInstance();
-            await windowController.initializeHotkeyListener();
        } finally {
            state.isLoading = false;
        }
@@ -483,50 +411,7 @@ export const useConfigStore = defineStore('config', () => {
        await updateAppearanceConfig('systemTheme', systemTheme);
    };

-    // 更新自定义主题方法
-    const updateCustomTheme = async (themeType: 'darkTheme' | 'lightTheme', colorKey: string, colorValue: string): Promise<void> => {
-        // 确保配置已加载
-        if (!state.configLoaded && !state.isLoading) {
-            await initConfig();
-        }

-        try {
-            // 深拷贝当前配置
-            const customTheme = JSON.parse(JSON.stringify(state.config.appearance.customTheme));
-            
-            // 更新对应主题的颜色值
-            customTheme[themeType][colorKey] = colorValue;
-            
-            // 更新整个自定义主题配置到后端
-            await ConfigService.Set(APPEARANCE_CONFIG_KEY_MAP.customTheme, customTheme);
-            
-            // 更新前端状态
-            state.config.appearance.customTheme = customTheme;
-        } catch (error) {
-            throw error;
-        }
-    };
-
-    // 设置整个自定义主题配置
-    const setCustomTheme = async (customTheme: any): Promise<void> => {
-        // 确保配置已加载
-        if (!state.configLoaded && !state.isLoading) {
-            await initConfig();
-        }
-
-        try {
-            // 更新整个自定义主题配置到后端
-            await ConfigService.Set(APPEARANCE_CONFIG_KEY_MAP.customTheme, customTheme);
-            
-            // 更新前端状态
-            state.config.appearance.customTheme = customTheme;
-            
-            // 确保Vue能检测到变化
-            state.config.appearance = { ...state.config.appearance };
-        } catch (error) {
-            throw error;
-        }
-    };

    // 初始化语言设置
    const initializeLanguage = async (): Promise<void> => {
@@ -591,8 +476,6 @@ export const useConfigStore = defineStore('config', () => {

        // 主题相关方法
        setSystemTheme,
-        updateCustomTheme,
-        setCustomTheme,

        // 字体大小操作
        ...adjusters.fontSize,
@@ -641,6 +524,10 @@ export const useConfigStore = defineStore('config', () => {
            // 再调用系统设置API
            await StartupService.SetEnabled(value);
        },
+        
+        // 窗口吸附配置相关方法
+        setEnableWindowSnap: async (value: boolean) => await updateGeneralConfig('enableWindowSnap', value),
+        setSnapThreshold: async (value: number) => await updateGeneralConfig('snapThreshold', value),

        // 更新配置相关方法
        setAutoUpdate: async (value: boolean) => await updateUpdatesConfig('autoUpdate', value),
--- a/frontend/src/stores/themeStore.ts
+++ b/frontend/src/stores/themeStore.ts
@@ -1,6 +1,7 @@
 import {defineStore} from 'pinia';
 import {computed, reactive} from 'vue';
-import {SystemThemeType} from '@/../bindings/voidraft/internal/models/models';
+import {SystemThemeType, ThemeType, ThemeColorConfig} from '@/../bindings/voidraft/internal/models/models';
+import {ThemeService} from '@/../bindings/voidraft/internal/services';
 import {useConfigStore} from './configStore';
 import {useEditorStore} from './editorStore';
 import {defaultDarkColors} from '@/views/editor/theme/dark';
@@ -24,16 +25,21 @@ export const useThemeStore = defineStore('theme', () => {
    configStore.config?.appearance?.systemTheme || SystemThemeType.SystemThemeAuto
  );

-  // 初始化主题颜色 - 从配置加载
-  const initializeThemeColors = () => {
-    const customTheme = configStore.config?.appearance?.customTheme;
-    if (customTheme) {
-      if (customTheme.darkTheme) {
-        Object.assign(themeColors.darkTheme, customTheme.darkTheme);
+  // 初始化主题颜色 - 从数据库加载
+  const initializeThemeColors = async () => {
+    try {
+      const themes = await ThemeService.GetDefaultThemes();
+      if (themes.dark) {
+        Object.assign(themeColors.darkTheme, themes.dark.colors);
      }
-      if (customTheme.lightTheme) {
-        Object.assign(themeColors.lightTheme, customTheme.lightTheme);
+      if (themes.light) {
+        Object.assign(themeColors.lightTheme, themes.light.colors);
      }
+    } catch (error) {
+      console.warn('Failed to load themes from database, using defaults:', error);
+      // 如果数据库加载失败，使用默认主题
+      Object.assign(themeColors.darkTheme, defaultDarkColors);
+      Object.assign(themeColors.lightTheme, defaultLightColors);
    }
  };

@@ -46,10 +52,10 @@ export const useThemeStore = defineStore('theme', () => {
  };

  // 初始化主题
-  const initializeTheme = () => {
+  const initializeTheme = async () => {
    const theme = configStore.config?.appearance?.systemTheme || SystemThemeType.SystemThemeAuto;
    applyThemeToDOM(theme);
-    initializeThemeColors();
+    await initializeThemeColors();
  };

  // 设置主题
@@ -84,31 +90,35 @@ export const useThemeStore = defineStore('theme', () => {
    return hasChanges;
  };
  
-  // 保存主题颜色到配置
+  // 保存主题颜色到数据库
  const saveThemeColors = async () => {
-    const customTheme = {
-      darkTheme: { ...themeColors.darkTheme },
-      lightTheme: { ...themeColors.lightTheme }
-    };
-    
-    await configStore.setCustomTheme(customTheme);
+    try {
+      const darkColors = ThemeColorConfig.createFrom(themeColors.darkTheme);
+      const lightColors = ThemeColorConfig.createFrom(themeColors.lightTheme);
+      
+      await ThemeService.UpdateThemeColors(ThemeType.ThemeTypeDark, darkColors);
+      await ThemeService.UpdateThemeColors(ThemeType.ThemeTypeLight, lightColors);
+    } catch (error) {
+      console.error('Failed to save theme colors:', error);
+      throw error;
+    }
  };
  
  // 重置主题颜色
  const resetThemeColors = async (themeType: 'darkTheme' | 'lightTheme') => {
    try {
-      // 1. 更新内存中的颜色状态
+      const dbThemeType = themeType === 'darkTheme' ? ThemeType.ThemeTypeDark : ThemeType.ThemeTypeLight;
+      
+      // 1. 调用后端重置服务
+      await ThemeService.ResetThemeColors(dbThemeType);
+      
+      // 2. 更新内存中的颜色状态
      if (themeType === 'darkTheme') {
        Object.assign(themeColors.darkTheme, defaultDarkColors);
-      }
-      
-      if (themeType === 'lightTheme') {
+      } else {
        Object.assign(themeColors.lightTheme, defaultLightColors);
      }
      
-      // 2. 保存到配置
-      await saveThemeColors();
-      
      // 3. 刷新编辑器主题
      refreshEditorTheme();
      
--- a/frontend/src/utils/windowController.ts
+++ b/frontend/src/utils/windowController.ts
@@ -1,105 +0,0 @@
-import * as wails from '@wailsio/runtime'
-
-// 窗口控制工具类
-export class WindowController {
-    private static instance: WindowController;
-    private currentWindow = wails.Window;
-    private isWindowVisible: boolean = true; // 跟踪窗口可见状态
-    private isInitialized: boolean = false; // 跟踪是否已初始化
-    private isToggling: boolean = false; // 防止重复切换
-    private lastToggleTime: number = 0; // 上次切换时间
-    private readonly TOGGLE_COOLDOWN = 500; // 切换冷却时间（毫秒）
-
-    static getInstance(): WindowController {
-        if (!WindowController.instance) {
-            WindowController.instance = new WindowController();
-        }
-        return WindowController.instance;
-    }
-
-    async toggleWindow(): Promise<void> {
-        const now = Date.now();
-
-        // 防抖检查
-        if (this.isToggling || (now - this.lastToggleTime) < this.TOGGLE_COOLDOWN) {
-            return;
-        }
-
-        this.isToggling = true;
-        this.lastToggleTime = now;
-
-        try {
-            // 如果还没初始化，先初始化状态
-            if (!this.isInitialized) {
-                await this.syncWindowState();
-            }
-
-            if (!this.isWindowVisible) {
-                // 窗口当前隐藏，显示它
-                await this.currentWindow.Show();
-                await this.currentWindow.UnMinimise(); // 修正API名称
-                await this.currentWindow.Focus();
-                this.isWindowVisible = true;
-            } else {
-                // 窗口当前可见，隐藏它
-                await this.currentWindow.Hide();
-                this.isWindowVisible = false;
-            }
-        } catch (error) {
-            console.error(error);
-        } finally {
-            // 延迟重置切换状态，确保操作完成
-            setTimeout(() => {
-                this.isToggling = false;
-            }, 100);
-        }
-    }
-
-    // 同步窗口状态
-    private async syncWindowState(): Promise<void> {
-        try {
-            // 检查窗口是否最小化
-            const isMinimised = await this.currentWindow.IsMinimised();
-
-            // 简化状态判断：只要不是最小化状态就认为是可见的
-            this.isWindowVisible = !isMinimised;
-
-            this.isInitialized = true;
-        } catch (error) {
-            // 如果检查失败，保持默认状态
-            this.isWindowVisible = true;
-            this.isInitialized = true;
-        }
-    }
-
-    // 当窗口被系统事件隐藏时调用（比如点击关闭/最小化按钮）
-    onWindowHidden(): void {
-        this.isWindowVisible = false;
-    }
-
-    // 当窗口被系统事件显示时调用（比如点击托盘图标）
-    onWindowShown(): void {
-        this.isWindowVisible = true;
-    }
-
-    async initializeHotkeyListener(): Promise<void> {
-        // 初始化时同步窗口状态
-        await this.syncWindowState();
-
-        // 监听后端发送的热键事件
-        wails.Events.On('hotkey:toggle-window', () => {
-            this.toggleWindow();
-        });
-
-        // 监听窗口显示/隐藏事件以同步状态
-        wails.Events.On('window:shown', () => {
-            this.onWindowShown();
-        });
-
-        wails.Events.On('window:hidden', () => {
-            this.onWindowHidden();
-        });
-
-
-    }
-}
--- a/frontend/src/views/settings/pages/AppearancePage.vue
+++ b/frontend/src/views/settings/pages/AppearancePage.vue
@@ -16,8 +16,8 @@ const themeStore = useThemeStore();

 // 添加临时颜色状态
 const tempColors = ref({
-  darkTheme: { ...configStore.config.appearance.customTheme?.darkTheme || defaultDarkColors },
-  lightTheme: { ...configStore.config.appearance.customTheme?.lightTheme || defaultLightColors }
+  darkTheme: { ...defaultDarkColors },
+  lightTheme: { ...defaultLightColors }
 });

 // 标记是否有未保存的更改
@@ -71,9 +71,9 @@ const currentThemeMode = computed(() => {
  return isDark ? 'dark' : 'light';
 });

-// 监听配置变更，更新临时颜色
+// 监听主题颜色变更，更新临时颜色
 watch(
-  () => configStore.config.appearance.customTheme,
+  () => themeStore.themeColors,
  (newValue) => {
    if (!hasUnsavedChanges.value) {
      tempColors.value = {
--- a/frontend/src/views/settings/pages/GeneralPage.vue
+++ b/frontend/src/views/settings/pages/GeneralPage.vue
@@ -159,6 +159,12 @@ const enableSystemTray = computed({
  set: (value: boolean) => configStore.setEnableSystemTray(value)
 });

+// 计算属性 - 启用窗口吸附
+const enableWindowSnap = computed({
+  get: () => configStore.config.general.enableWindowSnap,
+  set: (value: boolean) => configStore.setEnableWindowSnap(value)
+});
+
 // 计算属性 - 开机启动
 const startAtLogin = computed({
  get: () => configStore.config.general.startAtLogin,
@@ -334,6 +340,9 @@ onUnmounted(() => {
      <SettingItem :title="t('settings.enableSystemTray')">
        <ToggleSwitch v-model="enableSystemTray"/>
      </SettingItem>
+      <SettingItem :title="t('settings.enableWindowSnap')">
+        <ToggleSwitch v-model="enableWindowSnap"/>
+      </SettingItem>
    </SettingSection>

    <SettingSection :title="t('settings.startup')">
--- a/go.mod
+++ b/go.mod
@@ -11,11 +11,11 @@ require (
 	github.com/knadh/koanf/providers/structs v1.0.0
 	github.com/knadh/koanf/v2 v2.2.2
 	github.com/robertkrimen/otto v0.5.1
-	github.com/wailsapp/wails/v3 v3.0.0-alpha.12
-	golang.org/x/net v0.42.0
-	golang.org/x/sys v0.34.0
-	golang.org/x/text v0.27.0
-	modernc.org/sqlite v1.38.0
+	github.com/wailsapp/wails/v3 v3.0.0-alpha.25
+	golang.org/x/net v0.43.0
+	golang.org/x/sys v0.35.0
+	golang.org/x/text v0.28.0
+	modernc.org/sqlite v1.38.2
 )

 require (
@@ -67,20 +67,20 @@ require (
 	github.com/samber/lo v1.51.0 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
-	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/ulikunitz/xz v0.5.14 // indirect
 	github.com/wailsapp/go-webview2 v1.0.21 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
 	github.com/xanzy/go-gitlab v0.115.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.40.0 // indirect
-	golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc // indirect
+	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.66.3 // indirect
+	modernc.org/libc v1.66.7 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -158,14 +158,14 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
-github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=
+github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/wailsapp/go-webview2 v1.0.21 h1:k3dtoZU4KCoN/AEIbWiPln3P2661GtA2oEgA2Pb+maA=
 github.com/wailsapp/go-webview2 v1.0.21/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v3 v3.0.0-alpha.12 h1:z4wYfujk5tSuZXh+59S2DdEncQHG63CW51i2mZFKLS8=
-github.com/wailsapp/wails/v3 v3.0.0-alpha.12/go.mod h1:4LCCW7s9e4PuSmu7l9OTvfWIGMO8TaSiftSeR5NpBIc=
+github.com/wailsapp/wails/v3 v3.0.0-alpha.25 h1:o05zUiPEvmrq2lqqCs4wqnrnAjGmhryYHRhjQmtkvk8=
+github.com/wailsapp/wails/v3 v3.0.0-alpha.25/go.mod h1:UZpnhYuju4saspCJrIHAvC0H5XjtKnqd26FRxJLrQ0M=
 github.com/xanzy/go-gitlab v0.115.0 h1:6DmtItNcVe+At/liXSgfE/DZNZrGfalQmBRmOcJjOn8=
 github.com/xanzy/go-gitlab v0.115.0/go.mod h1:5XCDtM7AM6WMKmfDdOiEpyRWUqui2iS9ILfvCZ2gJ5M=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
@@ -174,19 +174,19 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
-golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc h1:TS73t7x3KarrNd5qAipmspBDS1rkMcgVG/fS1aRb4Rc=
-golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
+golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
@@ -203,21 +203,21 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
-golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -234,18 +234,18 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/cc/v4 v4.26.2 h1:991HMkLjJzYBIfha6ECZdjrIYz2/1ayr+FL8GN+CNzM=
-modernc.org/cc/v4 v4.26.2/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/cc/v4 v4.26.3 h1:yEN8dzrkRFnn4PUUKXLYIqVf2PJYAEjMTFjO3BDGc3I=
+modernc.org/cc/v4 v4.26.3/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU=
 modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE=
-modernc.org/fileutil v1.3.8 h1:qtzNm7ED75pd1C7WgAGcK4edm4fvhtBsEiI/0NQ54YM=
-modernc.org/fileutil v1.3.8/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+modernc.org/fileutil v1.3.15 h1:rJAXTP6ilMW/1+kzDiqmBlHLWszheUFXIyGQIAvjJpY=
+modernc.org/fileutil v1.3.15/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
 modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
 modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
-modernc.org/libc v1.66.3 h1:cfCbjTUcdsKyyZZfEUKfoHcP3S0Wkvz3jgSzByEWVCQ=
-modernc.org/libc v1.66.3/go.mod h1:XD9zO8kt59cANKvHPXpx7yS2ELPheAey0vjIuZOhOU8=
+modernc.org/libc v1.66.7 h1:rjhZ8OSCybKWxS1CJr0hikpEi6Vg+944Ouyrd+bQsoY=
+modernc.org/libc v1.66.7/go.mod h1:ln6tbWX0NH+mzApEoDRvilBvAWFt1HX7AUA4VDdVDPM=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
@@ -254,8 +254,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
 modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.38.0 h1:+4OrfPQ8pxHKuWG4md1JpR/EYAh3Md7TdejuuzE7EUI=
-modernc.org/sqlite v1.38.0/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE=
+modernc.org/sqlite v1.38.2 h1:Aclu7+tgjgcQVShZqim41Bbw9Cho0y/7WzYptXqkEek=
+modernc.org/sqlite v1.38.2/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
--- a/internal/models/config.go
+++ b/internal/models/config.go
@@ -68,6 +68,10 @@ type GeneralConfig struct {
 	EnableSystemTray bool   `json:"enableSystemTray"` // 是否启用系统托盘
 	StartAtLogin     bool   `json:"startAtLogin"`     // 开机启动设置

+	// 窗口吸附设置
+	EnableWindowSnap bool `json:"enableWindowSnap"` // 是否启用窗口吸附功能
+	SnapThreshold    int  `json:"snapThreshold"`    // 吸附距离阈值(像素)
+
 	// 全局热键设置
 	EnableGlobalHotkey bool        `json:"enableGlobalHotkey"` // 是否启用全局热键
 	GlobalHotkey       HotkeyCombo `json:"globalHotkey"`       // 全局热键组合
@@ -101,9 +105,8 @@ type EditingConfig struct {

 // AppearanceConfig 外观设置配置
 type AppearanceConfig struct {
-	Language    LanguageType      `json:"language"`    // 界面语言
-	SystemTheme SystemThemeType   `json:"systemTheme"` // 系统界面主题
-	CustomTheme CustomThemeConfig `json:"customTheme"` // 自定义主题配置
+	Language    LanguageType    `json:"language"`    // 界面语言
+	SystemTheme SystemThemeType `json:"systemTheme"` // 系统界面主题
 }

 // UpdatesConfig 更新设置配置
@@ -146,6 +149,8 @@ func NewDefaultAppConfig() *AppConfig {
 			DataPath:           dataDir,
 			EnableSystemTray:   true,
 			StartAtLogin:       false,
+			EnableWindowSnap:   true, // 默认启用窗口吸附
+			SnapThreshold:      15,   // 默认15像素的吸附阈值
 			EnableGlobalHotkey: false,
 			GlobalHotkey: HotkeyCombo{
 				Ctrl:  false,
@@ -171,7 +176,6 @@ func NewDefaultAppConfig() *AppConfig {
 		Appearance: AppearanceConfig{
 			Language:    LangEnUS,
 			SystemTheme: SystemThemeAuto,
-			CustomTheme: *NewDefaultCustomThemeConfig(),
 		},
 		Updates: UpdatesConfig{
 			Version:            "1.3.0",
--- a/internal/models/theme.go
+++ b/internal/models/theme.go
@@ -1,5 +1,20 @@
 package models

+import (
+	"database/sql/driver"
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+// ThemeType 主题类型枚举
+type ThemeType string
+
+const (
+	ThemeTypeDark  ThemeType = "dark"
+	ThemeTypeLight ThemeType = "light"
+)
+
 // ThemeColorConfig 主题颜色配置
 type ThemeColorConfig struct {
 	// 基础色调
@@ -36,15 +51,44 @@ type ThemeColorConfig struct {
 	MatchingBracket string `json:"matchingBracket"` // 匹配括号
 }

-// CustomThemeConfig 自定义主题配置
-type CustomThemeConfig struct {
-	DarkTheme  ThemeColorConfig `json:"darkTheme"`  // 深色主题配置
-	LightTheme ThemeColorConfig `json:"lightTheme"` // 浅色主题配置
+// Theme 主题数据库模型
+type Theme struct {
+	ID        int              `db:"id" json:"id"`
+	Name      string           `db:"name" json:"name"`
+	Type      ThemeType        `db:"type" json:"type"`
+	Colors    ThemeColorConfig `db:"colors" json:"colors"`
+	IsDefault bool             `db:"is_default" json:"isDefault"`
+	CreatedAt time.Time        `db:"created_at" json:"createdAt"`
+	UpdatedAt time.Time        `db:"updated_at" json:"updatedAt"`
+}
+
+// Value 实现 driver.Valuer 接口，用于将 ThemeColorConfig 存储到数据库
+func (tc ThemeColorConfig) Value() (driver.Value, error) {
+	return json.Marshal(tc)
+}
+
+// Scan 实现 sql.Scanner 接口，用于从数据库读取 ThemeColorConfig
+func (tc *ThemeColorConfig) Scan(value interface{}) error {
+	if value == nil {
+		return nil
+	}
+
+	var bytes []byte
+	switch v := value.(type) {
+	case []byte:
+		bytes = v
+	case string:
+		bytes = []byte(v)
+	default:
+		return fmt.Errorf("cannot scan %T into ThemeColorConfig", value)
+	}
+
+	return json.Unmarshal(bytes, tc)
 }

 // NewDefaultDarkTheme 创建默认深色主题配置
-func NewDefaultDarkTheme() ThemeColorConfig {
-	return ThemeColorConfig{
+func NewDefaultDarkTheme() *ThemeColorConfig {
+	return &ThemeColorConfig{
 		// 基础色调
 		Background:          "#252B37",
 		BackgroundSecondary: "#213644",
@@ -81,8 +125,8 @@ func NewDefaultDarkTheme() ThemeColorConfig {
 }

 // NewDefaultLightTheme 创建默认浅色主题配置
-func NewDefaultLightTheme() ThemeColorConfig {
-	return ThemeColorConfig{
+func NewDefaultLightTheme() *ThemeColorConfig {
+	return &ThemeColorConfig{
 		// 基础色调
 		Background:          "#ffffff",
 		BackgroundSecondary: "#f1faf1",
@@ -117,11 +161,3 @@ func NewDefaultLightTheme() ThemeColorConfig {
 		MatchingBracket: "#00000019",
 	}
 }
-
-// NewDefaultCustomThemeConfig 创建默认自定义主题配置
-func NewDefaultCustomThemeConfig() *CustomThemeConfig {
-	return &CustomThemeConfig{
-		DarkTheme:  NewDefaultDarkTheme(),
-		LightTheme: NewDefaultLightTheme(),
-	}
-}
--- a/internal/models/window.go
+++ b/internal/models/window.go
@@ -0,0 +1,41 @@
+package models
+
+import "time"
+
+// SnapEdge 表示吸附的边缘类型
+type SnapEdge int
+
+const (
+	SnapEdgeNone        SnapEdge = iota // 未吸附
+	SnapEdgeTop                         // 吸附到上边缘
+	SnapEdgeRight                       // 吸附到右边缘
+	SnapEdgeBottom                      // 吸附到下边缘
+	SnapEdgeLeft                        // 吸附到左边缘
+	SnapEdgeTopRight                    // 吸附到右上角
+	SnapEdgeBottomRight                 // 吸附到右下角
+	SnapEdgeBottomLeft                  // 吸附到左下角
+	SnapEdgeTopLeft                     // 吸附到左上角
+)
+
+// WindowPosition 窗口位置
+type WindowPosition struct {
+	X int `json:"x"` // X坐标
+	Y int `json:"y"` // Y坐标
+}
+
+// SnapPosition 表示吸附的相对位置
+type SnapPosition struct {
+	X int `json:"x"` // X轴相对偏移
+	Y int `json:"y"` // Y轴相对偏移
+}
+
+// WindowInfo 窗口信息
+type WindowInfo struct {
+	DocumentID int64          `json:"documentID"` // 文档ID
+	Title      string         `json:"title"`      // 窗口标题
+	IsSnapped  bool           `json:"isSnapped"`  // 是否处于吸附状态
+	SnapOffset SnapPosition   `json:"snapOffset"` // 与主窗口的相对位置偏移
+	SnapEdge   SnapEdge       `json:"snapEdge"`   // 吸附的边缘类型
+	LastPos    WindowPosition `json:"lastPos"`    // 上一次记录的窗口位置
+	MoveTime   time.Time      `json:"moveTime"`   // 上次移动时间，用于判断移动速度
+}
--- a/internal/services/backup_service.go
+++ b/internal/services/backup_service.go
@@ -30,14 +30,14 @@ type BackupService struct {
 	configService    *ConfigService
 	dbService        *DatabaseService
 	repository       *git.Repository
-	logger           *log.Service
+	logger           *log.LogService
 	isInitialized    bool
 	autoBackupTicker *time.Ticker
 	autoBackupStop   chan bool
 }

 // NewBackupService 创建新的备份服务实例
-func NewBackupService(configService *ConfigService, dbService *DatabaseService, logger *log.Service) *BackupService {
+func NewBackupService(configService *ConfigService, dbService *DatabaseService, logger *log.LogService) *BackupService {
 	return &BackupService{
 		configService: configService,
 		dbService:     dbService,
--- a/internal/services/config_migration_service.go
+++ b/internal/services/config_migration_service.go
@@ -38,7 +38,7 @@ type Migratable interface {

 // ConfigMigrationService 配置迁移服务
 type ConfigMigrationService[T Migratable] struct {
-	logger        *log.Service
+	logger        *log.LogService
 	configDir     string
 	configName    string
 	targetVersion string
@@ -54,7 +54,7 @@ type MigrationResult struct {

 // NewConfigMigrationService 创建配置迁移服务
 func NewConfigMigrationService[T Migratable](
-	logger *log.Service,
+	logger *log.LogService,
 	configDir string,
 	configName, targetVersion, configPath string,
 ) *ConfigMigrationService[T] {
@@ -312,7 +312,7 @@ func chainLoad(k *koanf.Koanf, loaders ...func() error) error {
 }

 // 工厂函数
-func NewAppConfigMigrationService(logger *log.Service, configDir, settingsPath string) *ConfigMigrationService[*models.AppConfig] {
+func NewAppConfigMigrationService(logger *log.LogService, configDir, settingsPath string) *ConfigMigrationService[*models.AppConfig] {
 	return NewConfigMigrationService[*models.AppConfig](
 		logger, configDir, "settings", CurrentAppConfigVersion, settingsPath)
 }
--- a/internal/services/config_notification_service.go
+++ b/internal/services/config_notification_service.go
@@ -24,6 +24,8 @@ const (
 	ConfigChangeTypeDataPath ConfigChangeType = "datapath"
 	// ConfigChangeTypeBackup 备份配置变更
 	ConfigChangeTypeBackup ConfigChangeType = "backup"
+	// ConfigChangeTypeWindowSnap 窗口吸附配置变更
+	ConfigChangeTypeWindowSnap ConfigChangeType = "windowsnap"
 )

 // ConfigChangeCallback 配置变更回调函数类型
@@ -51,7 +53,7 @@ type ConfigListener struct {
 type ConfigNotificationService struct {
 	listeners map[ConfigChangeType][]*ConfigListener // 支持多监听器的map
 	mu        sync.RWMutex                           // 监听器map的读写锁
-	logger    *log.Service                           // 日志服务
+	logger    *log.LogService                        // 日志服务
 	koanf     *koanf.Koanf                           // koanf实例
 	ctx       context.Context
 	cancel    context.CancelFunc
@@ -59,7 +61,7 @@ type ConfigNotificationService struct {
 }

 // NewConfigNotificationService 创建配置通知服务
-func NewConfigNotificationService(k *koanf.Koanf, logger *log.Service) *ConfigNotificationService {
+func NewConfigNotificationService(k *koanf.Koanf, logger *log.LogService) *ConfigNotificationService {
 	ctx, cancel := context.WithCancel(context.Background())
 	return &ConfigNotificationService{
 		listeners: make(map[ConfigChangeType][]*ConfigListener),
@@ -470,6 +472,29 @@ func CreateBackupConfigListener(name string, callback func(config *models.GitBac
 	}
 }

+// CreateWindowSnapConfigListener 创建窗口吸附配置监听器
+func CreateWindowSnapConfigListener(name string, callback func(enabled bool, threshold int) error) *ConfigListener {
+	return &ConfigListener{
+		Name:       name,
+		ChangeType: ConfigChangeTypeWindowSnap,
+		Callback: func(changeType ConfigChangeType, oldConfig, newConfig *models.AppConfig) error {
+			if newConfig == nil {
+				defaultConfig := models.NewDefaultAppConfig()
+				return callback(defaultConfig.General.EnableWindowSnap, defaultConfig.General.SnapThreshold)
+			}
+			return callback(newConfig.General.EnableWindowSnap, newConfig.General.SnapThreshold)
+		},
+		DebounceDelay: 200 * time.Millisecond,
+		GetConfigFunc: func(k *koanf.Koanf) *models.AppConfig {
+			var config models.AppConfig
+			if err := k.Unmarshal("", &config); err != nil {
+				return nil
+			}
+			return &config
+		},
+	}
+}
+
 // ServiceShutdown 关闭服务
 func (cns *ConfigNotificationService) ServiceShutdown() error {
 	cns.Cleanup()
--- a/internal/services/config_service.go
+++ b/internal/services/config_service.go
@@ -18,12 +18,12 @@ import (

 // ConfigService 应用配置服务
 type ConfigService struct {
-	koanf        *koanf.Koanf // koanf 实例
-	logger       *log.Service // 日志服务
-	configDir    string       // 配置目录
-	settingsPath string       // 设置文件路径
-	mu           sync.RWMutex // 读写锁
-	fileProvider *file.File   // 文件提供器，用于监听
+	koanf        *koanf.Koanf    // koanf 实例
+	logger       *log.LogService // 日志服务
+	configDir    string          // 配置目录
+	settingsPath string          // 设置文件路径
+	mu           sync.RWMutex    // 读写锁
+	fileProvider *file.File      // 文件提供器，用于监听

 	// 配置通知服务
 	notificationService *ConfigNotificationService
@@ -55,7 +55,7 @@ func (e *ConfigError) Is(target error) bool {
 }

 // NewConfigService 创建新的配置服务实例
-func NewConfigService(logger *log.Service) *ConfigService {
+func NewConfigService(logger *log.LogService) *ConfigService {
 	// 获取用户主目录
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
@@ -308,6 +308,16 @@ func (cs *ConfigService) SetBackupConfigChangeCallback(callback func(config *mod
 	return cs.notificationService.RegisterListener(backupListener)
 }

+// SetWindowSnapConfigChangeCallback 设置窗口吸附配置变更回调
+func (cs *ConfigService) SetWindowSnapConfigChangeCallback(callback func(enabled bool, threshold int) error) error {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+
+	// 创建窗口吸附配置监听器并注册
+	windowSnapListener := CreateWindowSnapConfigListener("DefaultWindowSnapConfigListener", callback)
+	return cs.notificationService.RegisterListener(windowSnapListener)
+}
+
 // ServiceShutdown 关闭服务
 func (cs *ConfigService) ServiceShutdown() error {
 	cs.stopWatching()
--- a/internal/services/database_service.go
+++ b/internal/services/database_service.go
@@ -63,6 +63,19 @@ CREATE TABLE IF NOT EXISTS key_bindings (
    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
    UNIQUE(command, extension)
 )`
+
+	// Themes table
+	sqlCreateThemesTable = `
+CREATE TABLE IF NOT EXISTS themes (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    name TEXT NOT NULL,
+    type TEXT NOT NULL,
+    colors TEXT NOT NULL,
+    is_default INTEGER NOT NULL DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(type, is_default)
+)`
 )

 // ColumnInfo 存储列的信息
@@ -80,7 +93,7 @@ type TableModel struct {
 // DatabaseService provides shared database functionality
 type DatabaseService struct {
 	configService *ConfigService
-	logger        *log.Service
+	logger        *log.LogService
 	db            *sql.DB
 	mu            sync.RWMutex
 	ctx           context.Context
@@ -88,7 +101,7 @@ type DatabaseService struct {
 }

 // NewDatabaseService creates a new database service
-func NewDatabaseService(configService *ConfigService, logger *log.Service) *DatabaseService {
+func NewDatabaseService(configService *ConfigService, logger *log.LogService) *DatabaseService {
 	if logger == nil {
 		logger = log.New()
 	}
@@ -112,6 +125,8 @@ func (ds *DatabaseService) registerAllModels() {
 	ds.RegisterModel("extensions", &models.Extension{})
 	// 快捷键表
 	ds.RegisterModel("key_bindings", &models.KeyBinding{})
+	// 主题表
+	ds.RegisterModel("themes", &models.Theme{})
 }

 // ServiceStartup initializes the service when the application starts
@@ -181,6 +196,7 @@ func (ds *DatabaseService) createTables() error {
 		sqlCreateDocumentsTable,
 		sqlCreateExtensionsTable,
 		sqlCreateKeyBindingsTable,
+		sqlCreateThemesTable,
 	}

 	for _, table := range tables {
@@ -204,6 +220,9 @@ func (ds *DatabaseService) createIndexes() error {
 		`CREATE INDEX IF NOT EXISTS idx_key_bindings_command ON key_bindings(command)`,
 		`CREATE INDEX IF NOT EXISTS idx_key_bindings_extension ON key_bindings(extension)`,
 		`CREATE INDEX IF NOT EXISTS idx_key_bindings_enabled ON key_bindings(enabled)`,
+		// Themes indexes
+		`CREATE INDEX IF NOT EXISTS idx_themes_type ON themes(type)`,
+		`CREATE INDEX IF NOT EXISTS idx_themes_is_default ON themes(is_default)`,
 	}

 	for _, index := range indexes {
--- a/internal/services/dialog_service.go
+++ b/internal/services/dialog_service.go
@@ -7,12 +7,12 @@ import (

 // DialogService 对话框服务，处理文件选择等对话框操作
 type DialogService struct {
-	logger *log.Service
+	logger *log.LogService
 	window *application.WebviewWindow // 绑定的窗口
 }

 // NewDialogService 创建新的对话框服务实例
-func NewDialogService(logger *log.Service) *DialogService {
+func NewDialogService(logger *log.LogService) *DialogService {
 	if logger == nil {
 		logger = log.New()
 	}
--- a/internal/services/document_service.go
+++ b/internal/services/document_service.go
@@ -79,13 +79,13 @@ WHERE id = ?`
 // DocumentService provides document management functionality
 type DocumentService struct {
 	databaseService *DatabaseService
-	logger          *log.Service
+	logger          *log.LogService
 	mu              sync.RWMutex
 	ctx             context.Context
 }

 // NewDocumentService creates a new document service
-func NewDocumentService(databaseService *DatabaseService, logger *log.Service) *DocumentService {
+func NewDocumentService(databaseService *DatabaseService, logger *log.LogService) *DocumentService {
 	if logger == nil {
 		logger = log.New()
 	}
@@ -216,14 +216,11 @@ func (ds *DocumentService) CreateDocument(title string) (*models.Document, error

 // LockDocument 锁定文档，防止删除
 func (ds *DocumentService) LockDocument(id int64) error {
-	ds.mu.Lock()
-	defer ds.mu.Unlock()
-
 	if ds.databaseService == nil || ds.databaseService.db == nil {
 		return errors.New("database service not available")
 	}

-	// 检查文档是否存在且未删除
+	// 先检查文档是否存在且未删除（不加锁避免死锁）
 	doc, err := ds.GetDocumentByID(id)
 	if err != nil {
 		return fmt.Errorf("failed to get document: %w", err)
@@ -240,6 +237,10 @@ func (ds *DocumentService) LockDocument(id int64) error {
 		return nil
 	}

+	// 现在加锁执行锁定操作
+	ds.mu.Lock()
+	defer ds.mu.Unlock()
+
 	_, err = ds.databaseService.db.Exec(sqlSetDocumentLocked, time.Now().Format("2006-01-02 15:04:05"), id)
 	if err != nil {
 		return fmt.Errorf("failed to lock document: %w", err)
@@ -249,14 +250,11 @@ func (ds *DocumentService) LockDocument(id int64) error {

 // UnlockDocument 解锁文档
 func (ds *DocumentService) UnlockDocument(id int64) error {
-	ds.mu.Lock()
-	defer ds.mu.Unlock()
-
 	if ds.databaseService == nil || ds.databaseService.db == nil {
 		return errors.New("database service not available")
 	}

-	// 检查文档是否存在
+	// 先检查文档是否存在（不加锁避免死锁）
 	doc, err := ds.GetDocumentByID(id)
 	if err != nil {
 		return fmt.Errorf("failed to get document: %w", err)
@@ -270,6 +268,10 @@ func (ds *DocumentService) UnlockDocument(id int64) error {
 		return nil
 	}

+	// 现在加锁执行解锁操作
+	ds.mu.Lock()
+	defer ds.mu.Unlock()
+
 	_, err = ds.databaseService.db.Exec(sqlSetDocumentUnlocked, time.Now().Format("2006-01-02 15:04:05"), id)
 	if err != nil {
 		return fmt.Errorf("failed to unlock document: %w", err)
@@ -311,10 +313,8 @@ func (ds *DocumentService) UpdateDocumentTitle(id int64, title string) error {

 // DeleteDocument marks a document as deleted (default document with ID=1 cannot be deleted)
 func (ds *DocumentService) DeleteDocument(id int64) error {
-	ds.mu.Lock()
-	defer ds.mu.Unlock()
-
 	if ds.databaseService == nil || ds.databaseService.db == nil {
+		ds.logger.Error("database service not available")
 		return errors.New("database service not available")
 	}

@@ -323,7 +323,7 @@ func (ds *DocumentService) DeleteDocument(id int64) error {
 		return fmt.Errorf("cannot delete the default document")
 	}

-	// 检查文档是否锁定
+	// 先检查文档是否存在和锁定状态（不加锁避免死锁）
 	doc, err := ds.GetDocumentByID(id)
 	if err != nil {
 		return fmt.Errorf("failed to get document: %w", err)
@@ -335,6 +335,10 @@ func (ds *DocumentService) DeleteDocument(id int64) error {
 		return fmt.Errorf("cannot delete locked document: %d", id)
 	}

+	// 现在加锁执行删除操作
+	ds.mu.Lock()
+	defer ds.mu.Unlock()
+
 	_, err = ds.databaseService.db.Exec(sqlMarkDocumentAsDeleted, time.Now().Format("2006-01-02 15:04:05"), id)
 	if err != nil {
 		return fmt.Errorf("failed to mark document as deleted: %w", err)
--- a/internal/services/extension_service.go
+++ b/internal/services/extension_service.go
@@ -41,7 +41,7 @@ WHERE id = ?`
 // ExtensionService 扩展管理服务
 type ExtensionService struct {
 	databaseService *DatabaseService
-	logger          *log.Service
+	logger          *log.LogService

 	mu       sync.RWMutex
 	ctx      context.Context
@@ -73,7 +73,7 @@ func (e *ExtensionError) Is(target error) bool {
 }

 // NewExtensionService 创建扩展服务实例
-func NewExtensionService(databaseService *DatabaseService, logger *log.Service) *ExtensionService {
+func NewExtensionService(databaseService *DatabaseService, logger *log.LogService) *ExtensionService {
 	if logger == nil {
 		logger = log.New()
 	}
--- a/internal/services/hotkey_service.go
+++ b/internal/services/hotkey_service.go
@@ -24,17 +24,19 @@ import (

 // HotkeyService Windows全局热键服务
 type HotkeyService struct {
-	logger        *log.Service
+	logger        *log.LogService
 	configService *ConfigService
+	windowService *WindowService
 	app           *application.App
+	mainWindow    *application.WebviewWindow

 	mu            sync.RWMutex
 	currentHotkey *models.HotkeyCombo
 	isRegistered  atomic.Bool

-	ctx    context.Context
-	cancel context.CancelFunc
-	wg     sync.WaitGroup
+	ctx        context.Context
+	cancelFunc atomic.Value // 使用atomic.Value存储cancel函数，避免竞态条件
+	wg         sync.WaitGroup
 }

 // HotkeyError 热键错误
@@ -51,24 +53,48 @@ func (e *HotkeyError) Unwrap() error {
 	return e.Err
 }

+// setCancelFunc 原子地设置cancel函数
+func (hs *HotkeyService) setCancelFunc(cancel context.CancelFunc) {
+	hs.cancelFunc.Store(cancel)
+}
+
+// getCancelFunc 原子地获取cancel函数
+func (hs *HotkeyService) getCancelFunc() context.CancelFunc {
+	if cancel := hs.cancelFunc.Load(); cancel != nil {
+		if cancelFunc, ok := cancel.(context.CancelFunc); ok {
+			return cancelFunc
+		}
+	}
+	return nil
+}
+
+// clearCancelFunc 原子地清除cancel函数
+func (hs *HotkeyService) clearCancelFunc() {
+	hs.cancelFunc.Store((context.CancelFunc)(nil))
+}
+
 // NewHotkeyService 创建热键服务实例
-func NewHotkeyService(configService *ConfigService, logger *log.Service) *HotkeyService {
+func NewHotkeyService(configService *ConfigService, windowService *WindowService, logger *log.LogService) *HotkeyService {
 	if logger == nil {
 		logger = log.New()
 	}

 	ctx, cancel := context.WithCancel(context.Background())
-	return &HotkeyService{
+	service := &HotkeyService{
 		logger:        logger,
 		configService: configService,
+		windowService: windowService,
 		ctx:           ctx,
-		cancel:        cancel,
 	}
+	// 初始化时设置cancel函数
+	service.setCancelFunc(cancel)
+	return service
 }

 // Initialize 初始化热键服务
-func (hs *HotkeyService) Initialize(app *application.App) error {
+func (hs *HotkeyService) Initialize(app *application.App, mainWindow *application.WebviewWindow) error {
 	hs.app = app
+	hs.mainWindow = mainWindow

 	config, err := hs.configService.GetConfig()
 	if err != nil {
@@ -119,7 +145,7 @@ func (hs *HotkeyService) RegisterHotkey(hotkey *models.HotkeyCombo) error {

 	hs.currentHotkey = hotkey
 	hs.isRegistered.Store(true)
-	hs.cancel = cancel
+	hs.setCancelFunc(cancel)

 	return nil
 }
@@ -137,13 +163,15 @@ func (hs *HotkeyService) unregisterInternal() error {
 		return nil
 	}

-	if hs.cancel != nil {
-		hs.cancel()
+	// 原子地获取并调用cancel函数
+	if cancel := hs.getCancelFunc(); cancel != nil {
+		cancel()
 		hs.wg.Wait()
 	}

 	hs.currentHotkey = nil
 	hs.isRegistered.Store(false)
+	hs.clearCancelFunc()
 	return nil
 }

@@ -165,7 +193,7 @@ func (hs *HotkeyService) hotkeyListener(ctx context.Context, hotkey *models.Hotk
 		return
 	}

-	ticker := time.NewTicker(100 * time.Millisecond)
+	ticker := time.NewTicker(50 * time.Millisecond)
 	defer ticker.Stop()

 	var wasPressed bool
@@ -199,11 +227,61 @@ func cBool(b bool) C.int {
 	return 0
 }

-// toggleWindow 切换窗口
+// toggleWindow 切换窗口显示状态
 func (hs *HotkeyService) toggleWindow() {
-	if hs.app != nil {
-		hs.app.Event.Emit("hotkey:toggle-window", nil)
+	if hs.mainWindow == nil {
+		hs.logger.Error("main window not set")
+		return
 	}
+
+	// 检查主窗口是否可见
+	if hs.isWindowVisible(hs.mainWindow) {
+		// 如果主窗口可见，隐藏所有窗口
+		hs.hideAllWindows()
+	} else {
+		// 如果主窗口不可见，显示所有窗口
+		hs.showAllWindows()
+	}
+}
+
+// isWindowVisible 检查窗口是否可见
+func (hs *HotkeyService) isWindowVisible(window *application.WebviewWindow) bool {
+	return window.IsVisible()
+}
+
+// hideAllWindows 隐藏所有窗口
+func (hs *HotkeyService) hideAllWindows() {
+	// 隐藏主窗口
+	hs.mainWindow.Hide()
+
+	// 隐藏所有子窗口
+	if hs.windowService != nil {
+		openWindows := hs.windowService.GetOpenWindows()
+		for _, windowInfo := range openWindows {
+			windowInfo.Window.Hide()
+		}
+	}
+
+	hs.logger.Debug("all windows hidden")
+}
+
+// showAllWindows 显示所有窗口
+func (hs *HotkeyService) showAllWindows() {
+	// 显示主窗口
+	hs.mainWindow.Show()
+	hs.mainWindow.Restore()
+	hs.mainWindow.Focus()
+
+	// 显示所有子窗口
+	if hs.windowService != nil {
+		openWindows := hs.windowService.GetOpenWindows()
+		for _, windowInfo := range openWindows {
+			windowInfo.Window.Show()
+			windowInfo.Window.Restore()
+		}
+	}
+
+	hs.logger.Debug("all windows shown")
 }

 // keyToVirtualKeyCode 键名转虚拟键码
@@ -261,7 +339,10 @@ func (hs *HotkeyService) IsRegistered() bool {

 // ServiceShutdown 关闭服务
 func (hs *HotkeyService) ServiceShutdown() error {
-	hs.cancel()
+	// 原子地获取并调用cancel函数
+	if cancel := hs.getCancelFunc(); cancel != nil {
+		cancel()
+	}
 	hs.wg.Wait()
 	return nil
 }
--- a/internal/services/hotkey_service_darwin.go
+++ b/internal/services/hotkey_service_darwin.go
@@ -66,6 +66,7 @@ int isHotkeyRegistered() {
 import "C"

 import (
+	"context"
 	"fmt"
 	"sync"
 	"sync/atomic"
@@ -80,12 +81,15 @@ var globalHotkeyService *HotkeyService

 // HotkeyService macOS全局热键服务
 type HotkeyService struct {
-	logger        *log.Service
+	logger        *log.LogService
 	configService *ConfigService
+	windowService *WindowService
 	app           *application.App
+	mainWindow    *application.WebviewWindow
 	mu            sync.RWMutex
 	isRegistered  atomic.Bool
 	currentHotkey *models.HotkeyCombo
+	cancelFunc    atomic.Value // 使用atomic.Value存储cancel函数，避免竞态条件
 }

 // HotkeyError 热键错误
@@ -104,8 +108,28 @@ func (e *HotkeyError) Unwrap() error {
 	return e.Err
 }

+// setCancelFunc 原子地设置cancel函数
+func (hs *HotkeyService) setCancelFunc(cancel context.CancelFunc) {
+	hs.cancelFunc.Store(cancel)
+}
+
+// getCancelFunc 原子地获取cancel函数
+func (hs *HotkeyService) getCancelFunc() context.CancelFunc {
+	if cancel := hs.cancelFunc.Load(); cancel != nil {
+		if cancelFunc, ok := cancel.(context.CancelFunc); ok {
+			return cancelFunc
+		}
+	}
+	return nil
+}
+
+// clearCancelFunc 原子地清除cancel函数
+func (hs *HotkeyService) clearCancelFunc() {
+	hs.cancelFunc.Store((context.CancelFunc)(nil))
+}
+
 // NewHotkeyService 创建新的热键服务实例
-func NewHotkeyService(configService *ConfigService, logger *log.Service) *HotkeyService {
+func NewHotkeyService(configService *ConfigService, windowService *WindowService, logger *log.LogService) *HotkeyService {
 	if logger == nil {
 		logger = log.New()
 	}
@@ -113,6 +137,7 @@ func NewHotkeyService(configService *ConfigService, logger *log.Service) *Hotkey
 	service := &HotkeyService{
 		logger:        logger,
 		configService: configService,
+		windowService: windowService,
 	}

 	// 设置全局实例
@@ -122,8 +147,9 @@ func NewHotkeyService(configService *ConfigService, logger *log.Service) *Hotkey
 }

 // Initialize 初始化热键服务
-func (hs *HotkeyService) Initialize(app *application.App) error {
+func (hs *HotkeyService) Initialize(app *application.App, mainWindow *application.WebviewWindow) error {
 	hs.app = app
+	hs.mainWindow = mainWindow

 	// 加载并应用当前配置
 	config, err := hs.configService.GetConfig()
@@ -285,9 +311,59 @@ func (hs *HotkeyService) IsRegistered() bool {

 // ToggleWindow 切换窗口显示状态
 func (hs *HotkeyService) ToggleWindow() {
-	if hs.app != nil {
-		hs.app.EmitEvent("hotkey:toggle-window", nil)
+	if hs.mainWindow == nil {
+		hs.logger.Error("main window not set")
+		return
 	}
+
+	// 检查主窗口是否可见
+	if hs.isWindowVisible(hs.mainWindow) {
+		// 如果主窗口可见，隐藏所有窗口
+		hs.hideAllWindows()
+	} else {
+		// 如果主窗口不可见，显示所有窗口
+		hs.showAllWindows()
+	}
+}
+
+// isWindowVisible 检查窗口是否可见
+func (hs *HotkeyService) isWindowVisible(window *application.WebviewWindow) bool {
+	return window.IsVisible()
+}
+
+// hideAllWindows 隐藏所有窗口
+func (hs *HotkeyService) hideAllWindows() {
+	// 隐藏主窗口
+	hs.mainWindow.Hide()
+
+	// 隐藏所有子窗口
+	if hs.windowService != nil {
+		openWindows := hs.windowService.GetOpenWindows()
+		for _, windowInfo := range openWindows {
+			windowInfo.Window.Hide()
+		}
+	}
+
+	hs.logger.Debug("all windows hidden")
+}
+
+// showAllWindows 显示所有窗口
+func (hs *HotkeyService) showAllWindows() {
+	// 显示主窗口
+	hs.mainWindow.Show()
+	hs.mainWindow.Restore()
+	hs.mainWindow.Focus()
+
+	// 显示所有子窗口
+	if hs.windowService != nil {
+		openWindows := hs.windowService.GetOpenWindows()
+		for _, windowInfo := range openWindows {
+			windowInfo.Window.Show()
+			windowInfo.Window.Restore()
+		}
+	}
+
+	hs.logger.Debug("all windows shown")
 }

 // ServiceShutdown 关闭热键服务
--- a/internal/services/hotkey_service_linux.go
+++ b/internal/services/hotkey_service_linux.go
@@ -141,17 +141,19 @@ import (

 // HotkeyService Linux全局热键服务
 type HotkeyService struct {
-	logger        *log.Service
+	logger        *log.LogService
 	configService *ConfigService
+	windowService *WindowService
 	app           *application.App
+	mainWindow    *application.WebviewWindow

 	mu            sync.RWMutex
 	currentHotkey *models.HotkeyCombo
 	isRegistered  atomic.Bool

-	ctx    context.Context
-	cancel context.CancelFunc
-	wg     sync.WaitGroup
+	ctx        context.Context
+	cancelFunc atomic.Value // 使用atomic.Value存储cancel函数，避免竞态条件
+	wg         sync.WaitGroup
 }

 // HotkeyError 热键错误
@@ -169,24 +171,48 @@ func (e *HotkeyError) Unwrap() error {
 	return e.Err
 }

+// setCancelFunc 原子地设置cancel函数
+func (hs *HotkeyService) setCancelFunc(cancel context.CancelFunc) {
+	hs.cancelFunc.Store(cancel)
+}
+
+// getCancelFunc 原子地获取cancel函数
+func (hs *HotkeyService) getCancelFunc() context.CancelFunc {
+	if cancel := hs.cancelFunc.Load(); cancel != nil {
+		if cancelFunc, ok := cancel.(context.CancelFunc); ok {
+			return cancelFunc
+		}
+	}
+	return nil
+}
+
+// clearCancelFunc 原子地清除cancel函数
+func (hs *HotkeyService) clearCancelFunc() {
+	hs.cancelFunc.Store((context.CancelFunc)(nil))
+}
+
 // NewHotkeyService 创建热键服务实例
-func NewHotkeyService(configService *ConfigService, logger *log.Service) *HotkeyService {
+func NewHotkeyService(configService *ConfigService, windowService *WindowService, logger *log.LogService) *HotkeyService {
 	if logger == nil {
 		logger = log.New()
 	}

 	ctx, cancel := context.WithCancel(context.Background())
-	return &HotkeyService{
+	service := &HotkeyService{
 		logger:        logger,
 		configService: configService,
+		windowService: windowService,
 		ctx:           ctx,
-		cancel:        cancel,
 	}
+	// 初始化时设置cancel函数
+	service.setCancelFunc(cancel)
+	return service
 }

 // Initialize 初始化热键服务
-func (hs *HotkeyService) Initialize(app *application.App) error {
+func (hs *HotkeyService) Initialize(app *application.App, mainWindow *application.WebviewWindow) error {
 	hs.app = app
+	hs.mainWindow = mainWindow

 	if int(C.initX11Display()) == 0 {
 		return &HotkeyError{"init_x11", fmt.Errorf("failed to initialize X11 display")}
@@ -253,7 +279,7 @@ func (hs *HotkeyService) RegisterHotkey(hotkey *models.HotkeyCombo) error {

 	hs.currentHotkey = hotkey
 	hs.isRegistered.Store(true)
-	hs.cancel = cancel
+	hs.setCancelFunc(cancel)

 	return nil
 }
@@ -271,8 +297,9 @@ func (hs *HotkeyService) unregisterInternal() error {
 		return nil
 	}

-	if hs.cancel != nil {
-		hs.cancel()
+	// 原子地获取并调用cancel函数
+	if cancel := hs.getCancelFunc(); cancel != nil {
+		cancel()
 		hs.wg.Wait()
 	}

@@ -283,6 +310,7 @@ func (hs *HotkeyService) unregisterInternal() error {

 	hs.currentHotkey = nil
 	hs.isRegistered.Store(false)
+	hs.clearCancelFunc()
 	return nil
 }

@@ -298,7 +326,8 @@ func (hs *HotkeyService) UpdateHotkey(enable bool, hotkey *models.HotkeyCombo) e
 func (hs *HotkeyService) hotkeyListener(ctx context.Context, ready chan<- error) {
 	defer hs.wg.Done()

-	ticker := time.NewTicker(100 * time.Millisecond)
+	// 优化轮询频率从100ms改为50ms，提高响应性
+	ticker := time.NewTicker(50 * time.Millisecond)
 	defer ticker.Stop()

 	ready <- nil // 标记准备就绪
@@ -315,11 +344,61 @@ func (hs *HotkeyService) hotkeyListener(ctx context.Context, ready chan<- error)
 	}
 }

-// toggleWindow 切换窗口
+// toggleWindow 切换窗口显示状态
 func (hs *HotkeyService) toggleWindow() {
-	if hs.app != nil {
-		hs.app.EmitEvent("hotkey:toggle-window", nil)
+	if hs.mainWindow == nil {
+		hs.logger.Error("main window not set")
+		return
 	}
+
+	// 检查主窗口是否可见
+	if hs.isWindowVisible(hs.mainWindow) {
+		// 如果主窗口可见，隐藏所有窗口
+		hs.hideAllWindows()
+	} else {
+		// 如果主窗口不可见，显示所有窗口
+		hs.showAllWindows()
+	}
+}
+
+// isWindowVisible 检查窗口是否可见
+func (hs *HotkeyService) isWindowVisible(window *application.WebviewWindow) bool {
+	return window.IsVisible()
+}
+
+// hideAllWindows 隐藏所有窗口
+func (hs *HotkeyService) hideAllWindows() {
+	// 隐藏主窗口
+	hs.mainWindow.Hide()
+
+	// 隐藏所有子窗口
+	if hs.windowService != nil {
+		openWindows := hs.windowService.GetOpenWindows()
+		for _, windowInfo := range openWindows {
+			windowInfo.Window.Hide()
+		}
+	}
+
+	hs.logger.Debug("all windows hidden")
+}
+
+// showAllWindows 显示所有窗口
+func (hs *HotkeyService) showAllWindows() {
+	// 显示主窗口
+	hs.mainWindow.Show()
+	hs.mainWindow.Restore()
+	hs.mainWindow.Focus()
+
+	// 显示所有子窗口
+	if hs.windowService != nil {
+		openWindows := hs.windowService.GetOpenWindows()
+		for _, windowInfo := range openWindows {
+			windowInfo.Window.Show()
+			windowInfo.Window.Restore()
+		}
+	}
+
+	hs.logger.Debug("all windows shown")
 }

 // keyToX11KeyCode 键名转X11键码
@@ -386,7 +465,10 @@ func (hs *HotkeyService) IsRegistered() bool {

 // ServiceShutdown 关闭服务
 func (hs *HotkeyService) ServiceShutdown() error {
-	hs.cancel()
+	// 原子地获取并调用cancel函数
+	if cancel := hs.getCancelFunc(); cancel != nil {
+		cancel()
+	}
 	hs.wg.Wait()
 	C.closeX11Display()
 	return nil
--- a/internal/services/keybinding_service.go
+++ b/internal/services/keybinding_service.go
@@ -51,7 +51,7 @@ const (
 // KeyBindingService 快捷键管理服务
 type KeyBindingService struct {
 	databaseService *DatabaseService
-	logger          *log.Service
+	logger          *log.LogService

 	mu       sync.RWMutex
 	ctx      context.Context
@@ -83,7 +83,7 @@ func (e *KeyBindingError) Is(target error) bool {
 }

 // NewKeyBindingService 创建快捷键服务实例
-func NewKeyBindingService(databaseService *DatabaseService, logger *log.Service) *KeyBindingService {
+func NewKeyBindingService(databaseService *DatabaseService, logger *log.LogService) *KeyBindingService {
 	if logger == nil {
 		logger = log.New()
 	}
--- a/internal/services/path_migration_service.go
+++ b/internal/services/path_migration_service.go
@@ -33,22 +33,24 @@ type MigrationProgress struct {

 // MigrationService 迁移服务
 type MigrationService struct {
-	logger   *log.Service
-	mu       sync.RWMutex
-	progress atomic.Value // stores MigrationProgress
+	logger    *log.LogService
+	dbService *DatabaseService
+	mu        sync.RWMutex
+	progress  atomic.Value // stores MigrationProgress

 	ctx    context.Context
 	cancel context.CancelFunc
 }

 // NewMigrationService 创建迁移服务
-func NewMigrationService(logger *log.Service) *MigrationService {
+func NewMigrationService(dbService *DatabaseService, logger *log.LogService) *MigrationService {
 	if logger == nil {
 		logger = log.New()
 	}

 	ms := &MigrationService{
-		logger: logger,
+		logger:    logger,
+		dbService: dbService,
 	}

 	// 初始化进度
@@ -104,6 +106,17 @@ func (ms *MigrationService) MigrateDirectory(srcPath, dstPath string) error {
 		return ms.failWithError(err)
 	}

+	// 迁移前断开数据库连接
+	ms.updateProgress(MigrationProgress{
+		Status:   MigrationStatusMigrating,
+		Progress: 10,
+	})
+
+	if ms.dbService != nil {
+		if err := ms.dbService.ServiceShutdown(); err != nil {
+			ms.logger.Error("Failed to close database connection", "error", err)
+		}
+	}
 	// 执行原子迁移
 	if err := ms.atomicMove(ctx, srcPath, dstPath); err != nil {
 		return ms.failWithError(err)
@@ -177,10 +190,17 @@ func (ms *MigrationService) atomicMove(ctx context.Context, srcPath, dstPath str
 	})

 	if err := os.Rename(srcPath, dstPath); err == nil {
+		// 重命名成功，更新进度到90%
+		ms.updateProgress(MigrationProgress{
+			Status:   MigrationStatusMigrating,
+			Progress: 90,
+		})
+		ms.logger.Info("Directory migration completed using direct rename", "src", srcPath, "dst", dstPath)
 		return nil
 	}

 	// 重命名失败，使用压缩迁移
+	ms.logger.Info("Direct rename failed, using compress migration", "src", srcPath, "dst", dstPath)
 	ms.updateProgress(MigrationProgress{
 		Status:   MigrationStatusMigrating,
 		Progress: 30,
@@ -249,12 +269,18 @@ func (ms *MigrationService) compressMove(ctx context.Context, srcPath, dstPath s
 	default:
 	}

+	// 验证迁移是否成功
+	if err := ms.verifyMigration(dstPath); err != nil {
+		// 迁移验证失败，清理目标目录
+		os.RemoveAll(dstPath)
+		return fmt.Errorf("migration verification failed: %v", err)
+	}
+
 	// 删除源目录
 	ms.updateProgress(MigrationProgress{
 		Status:   MigrationStatusMigrating,
 		Progress: 90,
 	})
-
 	os.RemoveAll(srcPath)
 	return nil
 }
@@ -404,6 +430,29 @@ func (ms *MigrationService) isSubDirectory(parent, target string) bool {
 	return len(target) > len(parent) && strings.HasPrefix(target, parent)
 }

+// verifyMigration 验证迁移是否成功
+func (ms *MigrationService) verifyMigration(dstPath string) error {
+	// 检查目标目录是否存在
+	dstStat, err := os.Stat(dstPath)
+	if err != nil {
+		return fmt.Errorf("target directory does not exist: %v", err)
+	}
+	if !dstStat.IsDir() {
+		return fmt.Errorf("target path is not a directory")
+	}
+
+	// 简单验证：检查目标目录是否非空
+	isEmpty, err := ms.isDirectoryEmpty(dstPath)
+	if err != nil {
+		return fmt.Errorf("failed to check target directory: %v", err)
+	}
+	if isEmpty {
+		return fmt.Errorf("target directory is empty after migration")
+	}
+
+	return nil
+}
+
 // CancelMigration 取消迁移
 func (ms *MigrationService) CancelMigration() error {
 	ms.mu.Lock()
--- a/internal/services/self_update_service.go
+++ b/internal/services/self_update_service.go
@@ -26,7 +26,7 @@ type SelfUpdateResult struct {

 // SelfUpdateService 自我更新服务
 type SelfUpdateService struct {
-	logger        *log.Service
+	logger        *log.LogService
 	configService *ConfigService
 	config        *models.AppConfig

@@ -35,7 +35,7 @@ type SelfUpdateService struct {
 }

 // NewSelfUpdateService 创建自我更新服务实例
-func NewSelfUpdateService(configService *ConfigService, logger *log.Service) (*SelfUpdateService, error) {
+func NewSelfUpdateService(configService *ConfigService, logger *log.LogService) (*SelfUpdateService, error) {
 	// 获取配置
 	appConfig, err := configService.GetConfig()
 	if err != nil {
--- a/internal/services/service_manager.go
+++ b/internal/services/service_manager.go
@@ -13,6 +13,7 @@ type ServiceManager struct {
 	databaseService    *DatabaseService
 	documentService    *DocumentService
 	windowService      *WindowService
+	windowSnapService  *WindowSnapService
 	migrationService   *MigrationService
 	systemService      *SystemService
 	hotkeyService      *HotkeyService
@@ -23,8 +24,9 @@ type ServiceManager struct {
 	startupService     *StartupService
 	selfUpdateService  *SelfUpdateService
 	translationService *TranslationService
+	themeService       *ThemeService
 	BackupService      *BackupService
-	logger             *log.Service
+	logger             *log.LogService
 }

 // NewServiceManager 创建新的服务管理器实例
@@ -39,7 +41,7 @@ func NewServiceManager() *ServiceManager {
 	databaseService := NewDatabaseService(configService, logger)

 	// 初始化迁移服务
-	migrationService := NewMigrationService(logger)
+	migrationService := NewMigrationService(databaseService, logger)

 	// 初始化文档服务
 	documentService := NewDocumentService(databaseService, logger)
@@ -47,11 +49,17 @@ func NewServiceManager() *ServiceManager {
 	// 初始化窗口服务
 	windowService := NewWindowService(logger, documentService)

+	// 初始化窗口吸附服务
+	windowSnapService := NewWindowSnapService(logger, configService)
+
+	// 将吸附服务与窗口服务关联
+	windowService.SetWindowSnapService(windowSnapService)
+
 	// 初始化系统服务
 	systemService := NewSystemService(logger)

 	// 初始化热键服务
-	hotkeyService := NewHotkeyService(configService, logger)
+	hotkeyService := NewHotkeyService(configService, windowService, logger)

 	// 初始化对话服务
 	dialogService := NewDialogService(logger)
@@ -77,6 +85,9 @@ func NewServiceManager() *ServiceManager {
 	// 初始化翻译服务
 	translationService := NewTranslationService(logger)

+	// 初始化主题服务
+	themeService := NewThemeService(databaseService, logger)
+
 	// 初始化备份服务
 	backupService := NewBackupService(configService, databaseService, logger)

@@ -104,11 +115,20 @@ func NewServiceManager() *ServiceManager {
 		panic(err)
 	}

+	// 设置窗口吸附配置变更回调
+	err = configService.SetWindowSnapConfigChangeCallback(func(enabled bool, threshold int) error {
+		return windowSnapService.OnWindowSnapConfigChanged(enabled, threshold)
+	})
+	if err != nil {
+		panic(err)
+	}
+
 	return &ServiceManager{
 		configService:      configService,
 		databaseService:    databaseService,
 		documentService:    documentService,
 		windowService:      windowService,
+		windowSnapService:  windowSnapService,
 		migrationService:   migrationService,
 		systemService:      systemService,
 		hotkeyService:      hotkeyService,
@@ -119,6 +139,7 @@ func NewServiceManager() *ServiceManager {
 		startupService:     startupService,
 		selfUpdateService:  selfUpdateService,
 		translationService: translationService,
+		themeService:       themeService,
 		BackupService:      backupService,
 		logger:             logger,
 	}
@@ -131,6 +152,7 @@ func (sm *ServiceManager) GetServices() []application.Service {
 		application.NewService(sm.databaseService),
 		application.NewService(sm.documentService),
 		application.NewService(sm.windowService),
+		application.NewService(sm.windowSnapService),
 		application.NewService(sm.keyBindingService),
 		application.NewService(sm.extensionService),
 		application.NewService(sm.migrationService),
@@ -141,6 +163,7 @@ func (sm *ServiceManager) GetServices() []application.Service {
 		application.NewService(sm.startupService),
 		application.NewService(sm.selfUpdateService),
 		application.NewService(sm.translationService),
+		application.NewService(sm.themeService),
 		application.NewService(sm.BackupService),
 	}
 	return services
@@ -157,7 +180,7 @@ func (sm *ServiceManager) GetDialogService() *DialogService {
 }

 // GetLogger 获取日志服务实例
-func (sm *ServiceManager) GetLogger() *log.Service {
+func (sm *ServiceManager) GetLogger() *log.LogService {
 	return sm.logger
 }

@@ -210,3 +233,13 @@ func (sm *ServiceManager) GetWindowService() *WindowService {
 func (sm *ServiceManager) GetDocumentService() *DocumentService {
 	return sm.documentService
 }
+
+// GetThemeService 获取主题服务实例
+func (sm *ServiceManager) GetThemeService() *ThemeService {
+	return sm.themeService
+}
+
+// GetWindowSnapService 获取窗口吸附服务实例
+func (sm *ServiceManager) GetWindowSnapService() *WindowSnapService {
+	return sm.windowSnapService
+}
--- a/internal/services/startup_darwin.go
+++ b/internal/services/startup_darwin.go
@@ -15,14 +15,14 @@ import (

 // DarwinStartupImpl macOS 平台开机启动实现
 type DarwinStartupImpl struct {
-	logger   *log.Service
+	logger   *log.LogService
 	disabled bool
 	appPath  string
 	appName  string
 }

 // newStartupImplementation 创建平台特定的开机启动实现
-func newStartupImplementation(logger *log.Service) StartupImplementation {
+func newStartupImplementation(logger *log.LogService) StartupImplementation {
 	return &DarwinStartupImpl{
 		logger: logger,
 	}
--- a/internal/services/startup_linux.go
+++ b/internal/services/startup_linux.go
@@ -13,7 +13,7 @@ import (

 // LinuxStartupImpl Linux 平台开机启动实现
 type LinuxStartupImpl struct {
-	logger       *log.Service
+	logger       *log.LogService
 	autostartDir string
 	execPath     string
 	appName      string
@@ -37,7 +37,7 @@ X-GNOME-Autostart-enabled=true
 `

 // newStartupImplementation 创建平台特定的开机启动实现
-func newStartupImplementation(logger *log.Service) StartupImplementation {
+func newStartupImplementation(logger *log.LogService) StartupImplementation {
 	return &LinuxStartupImpl{
 		logger: logger,
 	}
--- a/internal/services/startup_service.go
+++ b/internal/services/startup_service.go
@@ -7,7 +7,7 @@ import (
 // StartupService 开机启动服务
 type StartupService struct {
 	configService *ConfigService
-	logger        *log.Service
+	logger        *log.LogService
 	impl          StartupImplementation
 	initError     error
 }
@@ -19,7 +19,7 @@ type StartupImplementation interface {
 }

 // NewStartupService 创建开机启动服务实例
-func NewStartupService(configService *ConfigService, logger *log.Service) *StartupService {
+func NewStartupService(configService *ConfigService, logger *log.LogService) *StartupService {
 	service := &StartupService{
 		configService: configService,
 		logger:        logger,
--- a/internal/services/startup_windows.go
+++ b/internal/services/startup_windows.go
@@ -15,7 +15,7 @@ import (

 // WindowsStartupImpl Windows 平台开机启动实现
 type WindowsStartupImpl struct {
-	logger      *log.Service
+	logger      *log.LogService
 	registryKey string
 	execPath    string
 	workingDir  string
@@ -23,7 +23,7 @@ type WindowsStartupImpl struct {
 }

 // newStartupImplementation 创建平台特定的开机启动实现
-func newStartupImplementation(logger *log.Service) StartupImplementation {
+func newStartupImplementation(logger *log.LogService) StartupImplementation {
 	return &WindowsStartupImpl{
 		logger: logger,
 	}
--- a/internal/services/store_service.go
+++ b/internal/services/store_service.go
@@ -15,7 +15,7 @@ import (
 type StoreOption struct {
 	FilePath string
 	AutoSave bool
-	Logger   *log.Service
+	Logger   *log.LogService
 }

 // Store 泛型存储服务
@@ -25,7 +25,7 @@ type Store[T any] struct {
 	dataMap  sync.Map     // thread-safe map
 	unsaved  atomic.Bool
 	initOnce sync.Once
-	logger   *log.Service
+	logger   *log.LogService
 }

 // NewStore 存储服务
--- a/internal/services/system_service.go
+++ b/internal/services/system_service.go
@@ -9,7 +9,7 @@ import (

 // SystemService 系统监控服务
 type SystemService struct {
-	logger *log.Service
+	logger *log.LogService
 }

 // MemoryStats 内存统计信息
@@ -29,7 +29,7 @@ type MemoryStats struct {
 }

 // NewSystemService 创建新的系统服务实例
-func NewSystemService(logger *log.Service) *SystemService {
+func NewSystemService(logger *log.LogService) *SystemService {
 	return &SystemService{
 		logger: logger,
 	}
--- a/internal/services/theme_service.go
+++ b/internal/services/theme_service.go
@@ -0,0 +1,275 @@
+package services
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"time"
+	"voidraft/internal/models"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
+	"github.com/wailsapp/wails/v3/pkg/services/log"
+)
+
+// ThemeService 主题服务
+type ThemeService struct {
+	databaseService *DatabaseService
+	logger          *log.LogService
+	ctx             context.Context
+}
+
+// NewThemeService 创建新的主题服务
+func NewThemeService(databaseService *DatabaseService, logger *log.LogService) *ThemeService {
+	if logger == nil {
+		logger = log.New()
+	}
+
+	return &ThemeService{
+		databaseService: databaseService,
+		logger:          logger,
+	}
+}
+
+// ServiceStartup 服务启动时初始化
+func (ts *ThemeService) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	ts.ctx = ctx
+
+	// 初始化默认主题
+	return ts.initializeDefaultThemes()
+}
+
+// getDB 获取数据库连接
+func (ts *ThemeService) getDB() *sql.DB {
+	return ts.databaseService.db
+}
+
+// initializeDefaultThemes 初始化默认主题
+func (ts *ThemeService) initializeDefaultThemes() error {
+	db := ts.getDB()
+	if db == nil {
+		return fmt.Errorf("database not available")
+	}
+
+	// 检查是否已存在默认主题
+	var count int
+	err := db.QueryRow("SELECT COUNT(*) FROM themes WHERE is_default = 1").Scan(&count)
+	if err != nil {
+		return fmt.Errorf("failed to check existing themes: %w", err)
+	}
+
+	if count > 0 {
+		return nil // 默认主题已存在
+	}
+
+	// 创建默认深色主题
+	darkTheme := &models.Theme{
+		Name:      "Default Dark",
+		Type:      models.ThemeTypeDark,
+		Colors:    *models.NewDefaultDarkTheme(),
+		IsDefault: true,
+		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
+	}
+
+	// 创建默认浅色主题
+	lightTheme := &models.Theme{
+		Name:      "Default Light",
+		Type:      models.ThemeTypeLight,
+		Colors:    *models.NewDefaultLightTheme(),
+		IsDefault: true,
+		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
+	}
+
+	// 插入默认主题
+	if _, err := ts.CreateTheme(darkTheme); err != nil {
+		return fmt.Errorf("failed to create default dark theme: %w", err)
+	}
+
+	if _, err := ts.CreateTheme(lightTheme); err != nil {
+		return fmt.Errorf("failed to create default light theme: %w", err)
+	}
+
+	return nil
+}
+
+// GetDefaultThemes 获取默认主题
+func (ts *ThemeService) GetDefaultThemes() (map[models.ThemeType]*models.Theme, error) {
+	query := `
+		SELECT id, name, type, colors, is_default, created_at, updated_at 
+		FROM themes 
+		WHERE is_default = 1
+		ORDER BY type
+	`
+
+	db := ts.getDB()
+	rows, err := db.Query(query)
+	if err != nil {
+		return nil, fmt.Errorf("failed to query default themes: %w", err)
+	}
+	defer rows.Close()
+
+	themes := make(map[models.ThemeType]*models.Theme)
+	for rows.Next() {
+		theme := &models.Theme{}
+		err := rows.Scan(
+			&theme.ID,
+			&theme.Name,
+			&theme.Type,
+			&theme.Colors,
+			&theme.IsDefault,
+			&theme.CreatedAt,
+			&theme.UpdatedAt,
+		)
+		if err != nil {
+			return nil, fmt.Errorf("failed to scan theme: %w", err)
+		}
+		themes[theme.Type] = theme
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("failed to iterate themes: %w", err)
+	}
+
+	return themes, nil
+}
+
+// GetThemeByType 根据类型获取默认主题
+func (ts *ThemeService) GetThemeByType(themeType models.ThemeType) (*models.Theme, error) {
+	query := `
+		SELECT id, name, type, colors, is_default, created_at, updated_at 
+		FROM themes 
+		WHERE type = ? AND is_default = 1
+		LIMIT 1
+	`
+
+	theme := &models.Theme{}
+	db := ts.getDB()
+	err := db.QueryRow(query, themeType).Scan(
+		&theme.ID,
+		&theme.Name,
+		&theme.Type,
+		&theme.Colors,
+		&theme.IsDefault,
+		&theme.CreatedAt,
+		&theme.UpdatedAt,
+	)
+
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, fmt.Errorf("no default theme found for type: %s", themeType)
+		}
+		return nil, fmt.Errorf("failed to get theme by type: %w", err)
+	}
+
+	return theme, nil
+}
+
+// UpdateThemeColors 更新主题颜色
+func (ts *ThemeService) UpdateThemeColors(themeType models.ThemeType, colors models.ThemeColorConfig) error {
+	query := `
+		UPDATE themes 
+		SET colors = ?, updated_at = ?
+		WHERE type = ? AND is_default = 1
+	`
+
+	db := ts.getDB()
+	_, err := db.Exec(query, colors, time.Now(), themeType)
+	if err != nil {
+		return fmt.Errorf("failed to update theme colors: %w", err)
+	}
+
+	return nil
+}
+
+// ResetThemeColors 重置主题颜色为默认值
+func (ts *ThemeService) ResetThemeColors(themeType models.ThemeType) error {
+	var defaultColors models.ThemeColorConfig
+
+	switch themeType {
+	case models.ThemeTypeDark:
+		defaultColors = *models.NewDefaultDarkTheme()
+	case models.ThemeTypeLight:
+		defaultColors = *models.NewDefaultLightTheme()
+	default:
+		return fmt.Errorf("unknown theme type: %s", themeType)
+	}
+
+	return ts.UpdateThemeColors(themeType, defaultColors)
+}
+
+// CreateTheme 创建新主题
+func (ts *ThemeService) CreateTheme(theme *models.Theme) (*models.Theme, error) {
+	query := `
+		INSERT INTO themes (name, type, colors, is_default, created_at, updated_at)
+		VALUES (?, ?, ?, ?, ?, ?)
+	`
+
+	db := ts.getDB()
+	result, err := db.Exec(
+		query,
+		theme.Name,
+		theme.Type,
+		theme.Colors,
+		theme.IsDefault,
+		theme.CreatedAt,
+		theme.UpdatedAt,
+	)
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to create theme: %w", err)
+	}
+
+	id, err := result.LastInsertId()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get theme ID: %w", err)
+	}
+
+	theme.ID = int(id)
+	return theme, nil
+}
+
+// GetAllThemes 获取所有主题
+func (ts *ThemeService) GetAllThemes() ([]*models.Theme, error) {
+	query := `
+		SELECT id, name, type, colors, is_default, created_at, updated_at 
+		FROM themes 
+		ORDER BY is_default DESC, created_at ASC
+	`
+
+	db := ts.getDB()
+	rows, err := db.Query(query)
+	if err != nil {
+		return nil, fmt.Errorf("failed to query themes: %w", err)
+	}
+	defer rows.Close()
+
+	var themes []*models.Theme
+	for rows.Next() {
+		theme := &models.Theme{}
+		err := rows.Scan(
+			&theme.ID,
+			&theme.Name,
+			&theme.Type,
+			&theme.Colors,
+			&theme.IsDefault,
+			&theme.CreatedAt,
+			&theme.UpdatedAt,
+		)
+		if err != nil {
+			return nil, fmt.Errorf("failed to scan theme: %w", err)
+		}
+		themes = append(themes, theme)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("failed to iterate themes: %w", err)
+	}
+
+	return themes, nil
+}
+
+// ServiceShutdown 服务关闭
+func (ts *ThemeService) ServiceShutdown() error {
+	return nil
+}
--- a/internal/services/translation_service.go
+++ b/internal/services/translation_service.go
@@ -10,7 +10,7 @@ import (

 // TranslationService 翻译服务
 type TranslationService struct {
-	logger         *log.Service
+	logger         *log.LogService
 	factory        *translator.TranslatorFactory
 	defaultTimeout time.Duration
 	translators    map[translator.TranslatorType]translator.Translator
@@ -18,7 +18,7 @@ type TranslationService struct {
 }

 // NewTranslationService 创建翻译服务实例
-func NewTranslationService(logger *log.Service) *TranslationService {
+func NewTranslationService(logger *log.LogService) *TranslationService {
 	service := &TranslationService{
 		logger:         logger,
 		factory:        translator.NewTranslatorFactory(),
--- a/internal/services/tray_service.go
+++ b/internal/services/tray_service.go
@@ -7,14 +7,14 @@ import (

 // TrayService 系统托盘服务
 type TrayService struct {
-	logger        *log.Service
+	logger        *log.LogService
 	configService *ConfigService
 	app           *application.App
 	mainWindow    *application.WebviewWindow
 }

 // NewTrayService 创建新的系统托盘服务实例
-func NewTrayService(logger *log.Service, configService *ConfigService) *TrayService {
+func NewTrayService(logger *log.LogService, configService *ConfigService) *TrayService {
 	return &TrayService{
 		logger:        logger,
 		configService: configService,
@@ -42,7 +42,6 @@ func (ts *TrayService) HandleWindowClose() {
 	if ts.ShouldMinimizeToTray() {
 		// 隐藏到托盘
 		ts.mainWindow.Hide()
-		ts.app.Event.Emit("window:hidden", nil)
 	} else {
 		// 直接退出应用
 		ts.app.Quit()
@@ -54,7 +53,6 @@ func (ts *TrayService) HandleWindowMinimize() {
 	if ts.ShouldMinimizeToTray() {
 		// 隐藏到托盘
 		ts.mainWindow.Hide()
-		ts.app.Event.Emit("window:hidden", nil)
 	}
 }

@@ -64,9 +62,6 @@ func (ts *TrayService) ShowWindow() {
 		ts.mainWindow.Show()
 		ts.mainWindow.Restore()
 		ts.mainWindow.Focus()
-		if ts.app != nil {
-			ts.app.Event.Emit("window:shown", nil)
-		}
 	}
 }

--- a/internal/services/window_service.go
+++ b/internal/services/window_service.go
@@ -9,25 +9,28 @@ import (
 	"github.com/wailsapp/wails/v3/pkg/services/log"
 )

-// WindowInfo 窗口信息
+// WindowInfo 窗口信息（简化版）
 type WindowInfo struct {
 	Window     *application.WebviewWindow
 	DocumentID int64
 	Title      string
 }

-// WindowService 窗口管理服务
+// WindowService 窗口管理服务（专注于窗口生命周期管理）
 type WindowService struct {
-	logger          *log.Service
+	logger          *log.LogService
 	documentService *DocumentService
 	app             *application.App
 	mainWindow      *application.WebviewWindow
 	windows         map[int64]*WindowInfo // documentID -> WindowInfo
 	mu              sync.RWMutex
+
+	// 吸附服务引用
+	windowSnapService *WindowSnapService
 }

 // NewWindowService 创建新的窗口服务实例
-func NewWindowService(logger *log.Service, documentService *DocumentService) *WindowService {
+func NewWindowService(logger *log.LogService, documentService *DocumentService) *WindowService {
 	if logger == nil {
 		logger = log.New()
 	}
@@ -39,10 +42,20 @@ func NewWindowService(logger *log.Service, documentService *DocumentService) *Wi
 	}
 }

+// SetWindowSnapService 设置窗口吸附服务引用
+func (ws *WindowService) SetWindowSnapService(snapService *WindowSnapService) {
+	ws.windowSnapService = snapService
+}
+
 // SetAppReferences 设置应用和主窗口引用
 func (ws *WindowService) SetAppReferences(app *application.App, mainWindow *application.WebviewWindow) {
 	ws.app = app
 	ws.mainWindow = mainWindow
+
+	// 如果吸附服务已设置，也为它设置引用
+	if ws.windowSnapService != nil {
+		ws.windowSnapService.SetAppReferences(app, mainWindow)
+	}
 }

 // OpenDocumentWindow 为指定文档ID打开新窗口
@@ -101,9 +114,14 @@ func (ws *WindowService) OpenDocumentWindow(documentID int64) error {
 	}
 	ws.windows[documentID] = windowInfo

-	// 注册窗口关闭事件
+	// 注册窗口事件
 	ws.registerWindowEvents(newWindow, documentID)

+	// 向吸附服务注册新窗口
+	if ws.windowSnapService != nil {
+		ws.windowSnapService.RegisterWindow(documentID, newWindow, doc.Title)
+	}
+
 	return nil
 }

@@ -119,12 +137,17 @@ func (ws *WindowService) registerWindowEvents(window *application.WebviewWindow,
 func (ws *WindowService) onWindowClosing(documentID int64) {
 	ws.mu.Lock()
 	defer ws.mu.Unlock()
+
 	windowInfo, exists := ws.windows[documentID]
 	if exists {
 		windowInfo.Window.Close()
 		delete(ws.windows, documentID)
-	}

+		// 从吸附服务中取消注册
+		if ws.windowSnapService != nil {
+			ws.windowSnapService.UnregisterWindow(documentID)
+		}
+	}
 }

 // GetOpenWindows 获取所有打开的窗口信息
@@ -147,3 +170,18 @@ func (ws *WindowService) IsDocumentWindowOpen(documentID int64) bool {
 	_, exists := ws.windows[documentID]
 	return exists
 }
+
+// ServiceShutdown 实现服务关闭接口
+func (ws *WindowService) ServiceShutdown() error {
+	// 关闭所有窗口
+	ws.mu.Lock()
+	defer ws.mu.Unlock()
+
+	for documentID := range ws.windows {
+		if ws.windowSnapService != nil {
+			ws.windowSnapService.UnregisterWindow(documentID)
+		}
+	}
+
+	return nil
+}
--- a/internal/services/window_snap_service.go
+++ b/internal/services/window_snap_service.go
@@ -0,0 +1,603 @@
+package services
+
+import (
+	"context"
+	"math"
+	"sync"
+	"time"
+	"voidraft/internal/models"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
+	"github.com/wailsapp/wails/v3/pkg/services/log"
+)
+
+// WindowSnapService 窗口吸附服务
+type WindowSnapService struct {
+	logger        *log.LogService
+	configService *ConfigService
+	app           *application.App
+	mainWindow    *application.WebviewWindow
+	mu            sync.RWMutex
+
+	// 吸附配置
+	snapThreshold int  // 吸附触发的阈值距离(像素)
+	snapEnabled   bool // 是否启用窗口吸附功能
+
+	// 定时器控制
+	snapTicker *time.Ticker
+	ctx        context.Context
+	cancel     context.CancelFunc
+
+	// 性能优化相关
+	lastMainWindowPos models.WindowPosition // 缓存主窗口上次位置
+	changedWindows    map[int64]bool        // 记录哪些窗口发生了变化
+	skipFrames        int                   // 跳帧计数器，用于降低检测频率
+
+	// 监听的窗口列表
+	managedWindows map[int64]*SnapWindowInfo // documentID -> SnapWindowInfo
+}
+
+// SnapWindowInfo 吸附窗口信息
+type SnapWindowInfo struct {
+	Window     *application.WebviewWindow
+	DocumentID int64
+	Title      string
+	IsSnapped  bool                  // 是否处于吸附状态
+	SnapOffset models.SnapPosition   // 与主窗口的相对位置偏移
+	SnapEdge   models.SnapEdge       // 吸附的边缘类型
+	LastPos    models.WindowPosition // 上一次记录的窗口位置
+	MoveTime   time.Time             // 上次移动时间，用于判断移动速度
+}
+
+// NewWindowSnapService 创建新的窗口吸附服务实例
+func NewWindowSnapService(logger *log.LogService, configService *ConfigService) *WindowSnapService {
+	if logger == nil {
+		logger = log.New()
+	}
+
+	// 从配置获取窗口吸附设置
+	config, err := configService.GetConfig()
+	snapEnabled := true // 默认启用
+	snapThreshold := 15 // 默认阈值
+
+	if err == nil {
+		snapEnabled = config.General.EnableWindowSnap
+		snapThreshold = config.General.SnapThreshold
+	}
+
+	return &WindowSnapService{
+		logger:         logger,
+		configService:  configService,
+		snapThreshold:  snapThreshold,
+		snapEnabled:    snapEnabled,
+		managedWindows: make(map[int64]*SnapWindowInfo),
+		changedWindows: make(map[int64]bool),
+		skipFrames:     0,
+	}
+}
+
+// SetAppReferences 设置应用和主窗口引用
+func (wss *WindowSnapService) SetAppReferences(app *application.App, mainWindow *application.WebviewWindow) {
+	wss.app = app
+	wss.mainWindow = mainWindow
+
+	// 初始化上下文，用于控制goroutine的生命周期
+	wss.ctx, wss.cancel = context.WithCancel(context.Background())
+
+	// 启动窗口吸附监听器
+	wss.StartWindowSnapMonitor()
+}
+
+// RegisterWindow 注册需要吸附管理的窗口
+func (wss *WindowSnapService) RegisterWindow(documentID int64, window *application.WebviewWindow, title string) {
+	wss.mu.Lock()
+	defer wss.mu.Unlock()
+
+	wss.managedWindows[documentID] = &SnapWindowInfo{
+		Window:     window,
+		DocumentID: documentID,
+		Title:      title,
+		IsSnapped:  false,
+		SnapOffset: models.SnapPosition{X: 0, Y: 0},
+		SnapEdge:   models.SnapEdgeNone,
+		LastPos:    models.WindowPosition{X: 0, Y: 0},
+		MoveTime:   time.Now(),
+	}
+}
+
+// UnregisterWindow 取消注册窗口
+func (wss *WindowSnapService) UnregisterWindow(documentID int64) {
+	wss.mu.Lock()
+	defer wss.mu.Unlock()
+
+	delete(wss.managedWindows, documentID)
+	delete(wss.changedWindows, documentID)
+}
+
+// SetSnapEnabled 设置是否启用窗口吸附
+func (wss *WindowSnapService) SetSnapEnabled(enabled bool) {
+	wss.mu.Lock()
+	defer wss.mu.Unlock()
+
+	if wss.snapEnabled == enabled {
+		return
+	}
+
+	wss.snapEnabled = enabled
+
+	// 如果禁用吸附，解除所有吸附窗口
+	if !enabled {
+		for _, windowInfo := range wss.managedWindows {
+			if windowInfo.IsSnapped {
+				windowInfo.IsSnapped = false
+				windowInfo.SnapEdge = models.SnapEdgeNone
+			}
+		}
+		// 停止定时器
+		if wss.snapTicker != nil {
+			wss.snapTicker.Stop()
+			wss.snapTicker = nil
+		}
+	} else if wss.snapTicker == nil && wss.app != nil {
+		// 重新启动定时器
+		wss.StartWindowSnapMonitor()
+	}
+}
+
+// SetSnapThreshold 设置窗口吸附阈值
+func (wss *WindowSnapService) SetSnapThreshold(threshold int) {
+	wss.mu.Lock()
+	defer wss.mu.Unlock()
+
+	if threshold <= 0 || wss.snapThreshold == threshold {
+		return
+	}
+
+	wss.snapThreshold = threshold
+}
+
+// OnWindowSnapConfigChanged 处理窗口吸附配置变更
+func (wss *WindowSnapService) OnWindowSnapConfigChanged(enabled bool, threshold int) error {
+	wss.SetSnapEnabled(enabled)
+	wss.SetSnapThreshold(threshold)
+	return nil
+}
+
+// StartWindowSnapMonitor 启动窗口吸附监听器
+func (wss *WindowSnapService) StartWindowSnapMonitor() {
+	// 如果定时器已存在，先停止它
+	if wss.snapTicker != nil {
+		wss.snapTicker.Stop()
+	}
+
+	// 只有在吸附功能启用时才启动监听器
+	if !wss.snapEnabled {
+		return
+	}
+
+	// 创建新的定时器，20fps 以优化性能
+	wss.snapTicker = time.NewTicker(50 * time.Millisecond)
+
+	// 启动goroutine持续监听窗口位置
+	go func() {
+		for {
+			select {
+			case <-wss.snapTicker.C:
+				wss.checkAndApplySnapping()
+			case <-wss.ctx.Done():
+				// 上下文取消时停止goroutine
+				return
+			}
+		}
+	}()
+}
+
+// checkAndApplySnapping 检测并应用窗口吸附（性能优化版本）
+func (wss *WindowSnapService) checkAndApplySnapping() {
+	if !wss.snapEnabled {
+		return
+	}
+
+	// 性能优化：每3帧执行一次完整检测，其他时间只处理变化的窗口
+	wss.skipFrames++
+	fullCheck := wss.skipFrames%3 == 0
+
+	wss.mu.Lock()
+	defer wss.mu.Unlock()
+
+	// 检查主窗口是否存在且可见
+	if wss.mainWindow == nil || !wss.isMainWindowAvailable() {
+		// 主窗口不可用，解除所有吸附
+		for _, windowInfo := range wss.managedWindows {
+			if windowInfo.IsSnapped {
+				windowInfo.IsSnapped = false
+				windowInfo.SnapEdge = models.SnapEdgeNone
+			}
+		}
+		// 清空变化记录
+		wss.changedWindows = make(map[int64]bool)
+		return
+	}
+
+	mainPos, _ := wss.getWindowPosition(wss.mainWindow)
+
+	// 检查主窗口是否移动了
+	mainWindowMoved := mainPos.X != wss.lastMainWindowPos.X || mainPos.Y != wss.lastMainWindowPos.Y
+	if mainWindowMoved {
+		wss.lastMainWindowPos = mainPos
+		// 主窗口移动了，标记所有吸附的窗口为变化
+		for documentID, windowInfo := range wss.managedWindows {
+			if windowInfo.IsSnapped {
+				wss.changedWindows[documentID] = true
+			}
+		}
+	}
+
+	for documentID, windowInfo := range wss.managedWindows {
+		currentPos, _ := wss.getWindowPosition(windowInfo.Window)
+
+		// 检查窗口是否移动了
+		hasMoved := currentPos.X != windowInfo.LastPos.X || currentPos.Y != windowInfo.LastPos.Y
+		if hasMoved {
+			windowInfo.MoveTime = time.Now()
+			windowInfo.LastPos = currentPos
+			wss.changedWindows[documentID] = true
+		}
+
+		// 性能优化：只处理变化的窗口或进行完整检查时
+		if !fullCheck && !wss.changedWindows[documentID] {
+			continue
+		}
+
+		if windowInfo.IsSnapped {
+			// 窗口已吸附，检查是否需要更新位置或解除吸附
+			wss.handleSnappedWindow(windowInfo, mainPos, currentPos)
+		} else {
+			// 窗口未吸附，检查是否应该吸附
+			wss.handleUnsnappedWindow(windowInfo)
+		}
+
+		// 处理完成后清除变化标记
+		delete(wss.changedWindows, documentID)
+	}
+}
+
+// isMainWindowAvailable 检查主窗口是否可用
+func (wss *WindowSnapService) isMainWindowAvailable() bool {
+	if wss.mainWindow == nil {
+		return false
+	}
+
+	// 检查主窗口是否可见和正常状态
+	return wss.mainWindow.IsVisible()
+}
+
+// handleSnappedWindow 处理已吸附的窗口
+func (wss *WindowSnapService) handleSnappedWindow(windowInfo *SnapWindowInfo, mainPos models.WindowPosition, currentPos models.WindowPosition) {
+	// 计算预期位置基于主窗口的新位置
+	expectedX := mainPos.X + windowInfo.SnapOffset.X
+	expectedY := mainPos.Y + windowInfo.SnapOffset.Y
+
+	// 计算当前位置与预期位置的距离
+	distanceX := math.Abs(float64(currentPos.X - expectedX))
+	distanceY := math.Abs(float64(currentPos.Y - expectedY))
+	maxDistance := math.Max(distanceX, distanceY)
+
+	// 检测是否为用户主动拖拽：如果窗口移动幅度超过阈值且是最近移动的
+	userDragThreshold := float64(wss.snapThreshold)
+	isUserDrag := maxDistance > userDragThreshold && time.Since(windowInfo.MoveTime) < 100*time.Millisecond
+
+	if isUserDrag {
+		// 用户主动拖拽，立即解除吸附
+		windowInfo.IsSnapped = false
+		windowInfo.SnapEdge = models.SnapEdgeNone
+		return
+	}
+
+	// 对于主窗口移动导致的位置变化，立即跟随且不解除吸附
+	if maxDistance > 0 {
+		// 直接调整到预期位置，不使用平滑移动以提高响应速度
+		windowInfo.Window.SetPosition(expectedX, expectedY)
+		windowInfo.LastPos = models.WindowPosition{X: expectedX, Y: expectedY}
+	}
+}
+
+// handleUnsnappedWindow 处理未吸附的窗口
+func (wss *WindowSnapService) handleUnsnappedWindow(windowInfo *SnapWindowInfo) {
+	// 检查是否应该吸附到主窗口
+	should, snapEdge := wss.shouldSnapToMainWindow(windowInfo)
+	if should {
+		// 获取主窗口位置用于计算偏移量
+		mainPos, _ := wss.getWindowPosition(wss.mainWindow)
+
+		// 设置吸附状态
+		windowInfo.IsSnapped = true
+		windowInfo.SnapEdge = snapEdge
+
+		// 执行即时吸附，产生明显的吸附效果
+		wss.snapWindowToMainWindow(windowInfo, snapEdge)
+
+		// 重新获取吸附后的位置来计算偏移量
+		newPos, _ := wss.getWindowPosition(windowInfo.Window)
+		windowInfo.SnapOffset.X = newPos.X - mainPos.X
+		windowInfo.SnapOffset.Y = newPos.Y - mainPos.Y
+		windowInfo.LastPos = newPos
+	}
+}
+
+// getWindowPosition 获取窗口的位置
+func (wss *WindowSnapService) getWindowPosition(window *application.WebviewWindow) (models.WindowPosition, bool) {
+	x, y := window.Position()
+	return models.WindowPosition{X: x, Y: y}, true
+}
+
+// shouldSnapToMainWindow 检查窗口是否应该吸附到主窗口（支持角落吸附）
+func (wss *WindowSnapService) shouldSnapToMainWindow(windowInfo *SnapWindowInfo) (bool, models.SnapEdge) {
+	// 降低防抖时间，提高吸附响应速度
+	if time.Since(windowInfo.MoveTime) < 50*time.Millisecond {
+		return false, models.SnapEdgeNone
+	}
+
+	// 获取两个窗口的位置
+	mainPos, _ := wss.getWindowPosition(wss.mainWindow)
+	windowPos, _ := wss.getWindowPosition(windowInfo.Window)
+
+	// 获取主窗口尺寸
+	mainWidth, mainHeight := wss.mainWindow.Size()
+
+	// 获取子窗口尺寸
+	windowWidth, windowHeight := windowInfo.Window.Size()
+
+	// 计算各个边缘的距离
+	threshold := float64(wss.snapThreshold)
+	cornerThreshold := threshold * 1.5 // 角落吸附需要更大的阈值
+
+	// 主窗口的四个边界
+	mainLeft := mainPos.X
+	mainTop := mainPos.Y
+	mainRight := mainPos.X + mainWidth
+	mainBottom := mainPos.Y + mainHeight
+
+	// 子窗口的四个边界
+	windowLeft := windowPos.X
+	windowTop := windowPos.Y
+	windowRight := windowPos.X + windowWidth
+	windowBottom := windowPos.Y + windowHeight
+
+	// 存储每个边缘的吸附信息
+	type snapCandidate struct {
+		edge     models.SnapEdge
+		distance float64
+		overlap  float64 // 重叠度，用于优先级判断
+		isCorner bool    // 是否为角落吸附
+	}
+
+	var candidates []snapCandidate
+
+	// ==== 检查角落吸附（优先级最高） ====
+
+	// 1. 右上角 (SnapEdgeTopRight)
+	distToTopRight := math.Sqrt(math.Pow(float64(mainRight-windowLeft), 2) + math.Pow(float64(mainTop-windowBottom), 2))
+	if distToTopRight <= cornerThreshold {
+		// 检查是否接近右上角区域
+		horizDist := math.Abs(float64(mainRight - windowLeft))
+		vertDist := math.Abs(float64(mainTop - windowBottom))
+		if horizDist <= cornerThreshold && vertDist <= cornerThreshold {
+			candidates = append(candidates, snapCandidate{models.SnapEdgeTopRight, distToTopRight, 100, true})
+		}
+	}
+
+	// 2. 右下角 (SnapEdgeBottomRight)
+	distToBottomRight := math.Sqrt(math.Pow(float64(mainRight-windowLeft), 2) + math.Pow(float64(mainBottom-windowTop), 2))
+	if distToBottomRight <= cornerThreshold {
+		horizDist := math.Abs(float64(mainRight - windowLeft))
+		vertDist := math.Abs(float64(mainBottom - windowTop))
+		if horizDist <= cornerThreshold && vertDist <= cornerThreshold {
+			candidates = append(candidates, snapCandidate{models.SnapEdgeBottomRight, distToBottomRight, 100, true})
+		}
+	}
+
+	// 3. 左下角 (SnapEdgeBottomLeft)
+	distToBottomLeft := math.Sqrt(math.Pow(float64(mainLeft-windowRight), 2) + math.Pow(float64(mainBottom-windowTop), 2))
+	if distToBottomLeft <= cornerThreshold {
+		horizDist := math.Abs(float64(mainLeft - windowRight))
+		vertDist := math.Abs(float64(mainBottom - windowTop))
+		if horizDist <= cornerThreshold && vertDist <= cornerThreshold {
+			candidates = append(candidates, snapCandidate{models.SnapEdgeBottomLeft, distToBottomLeft, 100, true})
+		}
+	}
+
+	// 4. 左上角 (SnapEdgeTopLeft)
+	distToTopLeft := math.Sqrt(math.Pow(float64(mainLeft-windowRight), 2) + math.Pow(float64(mainTop-windowBottom), 2))
+	if distToTopLeft <= cornerThreshold {
+		horizDist := math.Abs(float64(mainLeft - windowRight))
+		vertDist := math.Abs(float64(mainTop - windowBottom))
+		if horizDist <= cornerThreshold && vertDist <= cornerThreshold {
+			candidates = append(candidates, snapCandidate{models.SnapEdgeTopLeft, distToTopLeft, 100, true})
+		}
+	}
+
+	// ==== 检查边缘吸附（只在没有角落吸附时检查） ====
+	if len(candidates) == 0 {
+		// 1. 吸附到主窗口右侧
+		distToRight := math.Abs(float64(mainRight - windowLeft))
+		if distToRight <= threshold {
+			// 计算垂直重叠
+			overlapTop := math.Max(float64(mainTop), float64(windowTop))
+			overlapBottom := math.Min(float64(mainBottom), float64(windowBottom))
+			verticalOverlap := math.Max(0, overlapBottom-overlapTop)
+			candidates = append(candidates, snapCandidate{models.SnapEdgeRight, distToRight, verticalOverlap, false})
+		}
+
+		// 2. 吸附到主窗口左侧
+		distToLeft := math.Abs(float64(mainLeft - windowRight))
+		if distToLeft <= threshold {
+			// 计算垂直重叠
+			overlapTop := math.Max(float64(mainTop), float64(windowTop))
+			overlapBottom := math.Min(float64(mainBottom), float64(windowBottom))
+			verticalOverlap := math.Max(0, overlapBottom-overlapTop)
+			candidates = append(candidates, snapCandidate{models.SnapEdgeLeft, distToLeft, verticalOverlap, false})
+		}
+
+		// 3. 吸附到主窗口底部
+		distToBottom := math.Abs(float64(mainBottom - windowTop))
+		if distToBottom <= threshold {
+			// 计算水平重叠
+			overlapLeft := math.Max(float64(mainLeft), float64(windowLeft))
+			overlapRight := math.Min(float64(mainRight), float64(windowRight))
+			horizontalOverlap := math.Max(0, overlapRight-overlapLeft)
+			candidates = append(candidates, snapCandidate{models.SnapEdgeBottom, distToBottom, horizontalOverlap, false})
+		}
+
+		// 4. 吸附到主窗口顶部
+		distToTop := math.Abs(float64(mainTop - windowBottom))
+		if distToTop <= threshold {
+			// 计算水平重叠
+			overlapLeft := math.Max(float64(mainLeft), float64(windowLeft))
+			overlapRight := math.Min(float64(mainRight), float64(windowRight))
+			horizontalOverlap := math.Max(0, overlapRight-overlapLeft)
+			candidates = append(candidates, snapCandidate{models.SnapEdgeTop, distToTop, horizontalOverlap, false})
+		}
+	}
+
+	// 如果没有候选，不吸附
+	if len(candidates) == 0 {
+		return false, models.SnapEdgeNone
+	}
+
+	// 选择最佳吸附位置：角落吸附优先，其次考虑重叠度，最后考虑距离
+	bestCandidate := candidates[0]
+	for _, candidate := range candidates[1:] {
+		// 角落吸附优先级最高
+		if candidate.isCorner && !bestCandidate.isCorner {
+			bestCandidate = candidate
+		} else if bestCandidate.isCorner && !candidate.isCorner {
+			// 继续使用当前的角落吸附
+			continue
+		} else {
+			// 同类型的吸附，比较重叠度和距离
+			if math.Abs(candidate.overlap-bestCandidate.overlap) < 10 {
+				if candidate.distance < bestCandidate.distance {
+					bestCandidate = candidate
+				}
+			} else if candidate.overlap > bestCandidate.overlap {
+				// 重叠度更高的优先
+				bestCandidate = candidate
+			}
+		}
+	}
+
+	return true, bestCandidate.edge
+}
+
+// snapWindowToMainWindow 将窗口精确吸附到主窗口边缘（支持角落吸附）
+func (wss *WindowSnapService) snapWindowToMainWindow(windowInfo *SnapWindowInfo, snapEdge models.SnapEdge) {
+	// 获取主窗口位置和尺寸
+	mainPos, _ := wss.getWindowPosition(wss.mainWindow)
+	mainWidth, mainHeight := wss.mainWindow.Size()
+
+	// 获取子窗口位置和尺寸
+	windowPos, _ := wss.getWindowPosition(windowInfo.Window)
+	windowWidth, windowHeight := windowInfo.Window.Size()
+
+	// 计算目标位置
+	var targetX, targetY int
+
+	switch snapEdge {
+	case models.SnapEdgeRight:
+		// 吸附到主窗口右侧
+		targetX = mainPos.X + mainWidth
+		targetY = windowPos.Y // 保持当前 Y 位置
+		// 如果超出主窗口范围，调整到边界
+		if targetY < mainPos.Y {
+			targetY = mainPos.Y
+		} else if targetY+windowHeight > mainPos.Y+mainHeight {
+			targetY = mainPos.Y + mainHeight - windowHeight
+		}
+
+	case models.SnapEdgeLeft:
+		// 吸附到主窗口左侧
+		targetX = mainPos.X - windowWidth
+		targetY = windowPos.Y // 保持当前 Y 位置
+		// 如果超出主窗口范围，调整到边界
+		if targetY < mainPos.Y {
+			targetY = mainPos.Y
+		} else if targetY+windowHeight > mainPos.Y+mainHeight {
+			targetY = mainPos.Y + mainHeight - windowHeight
+		}
+
+	case models.SnapEdgeBottom:
+		// 吸附到主窗口底部
+		targetX = windowPos.X // 保持当前 X 位置
+		targetY = mainPos.Y + mainHeight
+		// 如果超出主窗口范围，调整到边界
+		if targetX < mainPos.X {
+			targetX = mainPos.X
+		} else if targetX+windowWidth > mainPos.X+mainWidth {
+			targetX = mainPos.X + mainWidth - windowWidth
+		}
+
+	case models.SnapEdgeTop:
+		// 吸附到主窗口顶部
+		targetX = windowPos.X // 保持当前 X 位置
+		targetY = mainPos.Y - windowHeight
+		// 如果超出主窗口范围，调整到边界
+		if targetX < mainPos.X {
+			targetX = mainPos.X
+		} else if targetX+windowWidth > mainPos.X+mainWidth {
+			targetX = mainPos.X + mainWidth - windowWidth
+		}
+
+	// ==== 角落吸附 ====
+	case models.SnapEdgeTopRight:
+		// 吸附到右上角
+		targetX = mainPos.X + mainWidth
+		targetY = mainPos.Y - windowHeight
+
+	case models.SnapEdgeBottomRight:
+		// 吸附到右下角
+		targetX = mainPos.X + mainWidth
+		targetY = mainPos.Y + mainHeight
+
+	case models.SnapEdgeBottomLeft:
+		// 吸附到左下角
+		targetX = mainPos.X - windowWidth
+		targetY = mainPos.Y + mainHeight
+
+	case models.SnapEdgeTopLeft:
+		// 吸附到左上角
+		targetX = mainPos.X - windowWidth
+		targetY = mainPos.Y - windowHeight
+
+	default:
+		// 不应该到达这里
+		return
+	}
+
+	// 直接移动到目标位置，不使用平滑过渡以产生明显的吸附效果
+	windowInfo.Window.SetPosition(targetX, targetY)
+
+	// 更新窗口信息
+	windowInfo.SnapEdge = snapEdge
+	windowInfo.LastPos = models.WindowPosition{X: targetX, Y: targetY}
+}
+
+// Cleanup 清理资源
+func (wss *WindowSnapService) Cleanup() {
+	// 如果有取消函数，调用它来停止所有goroutine
+	if wss.cancel != nil {
+		wss.cancel()
+	}
+
+	// 停止定时器
+	if wss.snapTicker != nil {
+		wss.snapTicker.Stop()
+		wss.snapTicker = nil
+	}
+}
+
+// ServiceShutdown 实现服务关闭接口
+func (wss *WindowSnapService) ServiceShutdown() error {
+	wss.Cleanup()
+	return nil
+}
--- a/main.go
+++ b/main.go
@@ -25,6 +25,7 @@ var assets embed.FS
 // logs any error that might occur.
 func main() {
 	serviceManager := services.NewServiceManager()
+	var window *application.WebviewWindow

 	var encryptionKey = [32]byte{
 		0x1e, 0x1f, 0x1c, 0x1d, 0x1a, 0x1b, 0x18, 0x19,
@@ -51,6 +52,13 @@ func main() {
 		SingleInstance: &application.SingleInstanceOptions{
 			UniqueID:      "com.voidraft",
 			EncryptionKey: encryptionKey,
+			OnSecondInstanceLaunch: func(data application.SecondInstanceData) {
+				if window != nil {
+					window.Show()
+					window.Restore()
+					window.Focus()
+				}
+			},
 			AdditionalData: map[string]string{
 				"launchtime": time.Now().Local().String(),
 			},
@@ -82,6 +90,7 @@ func main() {
 		URL:              "/",
 	})
 	mainWindow.Center()
+	window = mainWindow

 	// 获取托盘服务并设置应用引用
 	trayService := serviceManager.GetTrayService()
@@ -96,7 +105,7 @@ func main() {

 	// 初始化热键服务
 	hotkeyService := serviceManager.GetHotkeyService()
-	err := hotkeyService.Initialize(app)
+	err := hotkeyService.Initialize(app, mainWindow)
 	if err != nil {
 		panic(err)
 	}
Author	SHA1	Message	Date
landaiqing	fa72ff8061	Merge remote-tracking branch 'github/dependabot/go_modules/github.com/ulikunitz/xz-0.5.14'	2025-08-30 19:00:36 +08:00
landaiqing	65f24860e6	✨ Added window snapping function toggle	2025-08-30 00:18:29 +08:00
dependabot[bot]	4881233211	⬆️ Bump github.com/ulikunitz/xz from 0.5.12 to 0.5.14 Bumps [github.com/ulikunitz/xz](https://github.com/ulikunitz/xz) from 0.5.12 to 0.5.14. - [Commits](https://github.com/ulikunitz/xz/compare/v0.5.12...v0.5.14) --- updated-dependencies: - dependency-name: github.com/ulikunitz/xz dependency-version: 0.5.14 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-28 19:44:41 +00:00
landaiqing	bc01fdf362	✨ Added window snapping feature	2025-08-24 16:07:48 +08:00
landaiqing	709998ff9c	🐛 Fixed hotkey crashes	2025-08-19 22:26:55 +08:00
landaiqing	6adeadeed4	🐛 Fixed document deadlock issue	2025-08-19 00:24:51 +08:00
landaiqing	7b70a39b23	🐛 Fixed hotkey service issues	2025-08-19 00:08:50 +08:00
landaiqing	873a3c0e60	✨ Modify the theme storage schema	2025-08-17 19:34:35 +08:00
landaiqing	5b88efcfbe	🐛 Fixed the window toggle maximise issue	2025-08-17 14:51:39 +08:00