From be40442fa8ac9737ff749e8bac4647cdca4490ea Mon Sep 17 00:00:00 2001
From: Julian Freeman <freemanjulian372@gmail.com>
Date: Sun, 22 Mar 2026 20:42:58 -0400
Subject: [PATCH] remove mergeScreens

---
 src-tauri/src/engine.rs | 5 +----
 src/App.vue             | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src-tauri/src/engine.rs b/src-tauri/src/engine.rs
index b4f3c7f..700d54f 100644
--- a/src-tauri/src/engine.rs
+++ b/src-tauri/src/engine.rs
@@ -283,10 +283,7 @@ async fn capture_screens(app: &AppHandle) -> anyhow::Result<()> {
         fs::create_dir_all(&base_dir)?;
     }
 
-    let merge_screens = store
-        .get("mergeScreens")
-        .and_then(|v| v.as_bool())
-        .unwrap_or(false);
+    let merge_screens = true;
 
     let monitors = Monitor::all()?;
     let now = Local::now();
diff --git a/src/App.vue b/src/App.vue
index dc9a8a8..985e403 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,7 +35,6 @@ const showToast = (message: string, type = "success") => {
   setTimeout(() => { toast.value.visible = false; }, 3000);
 };
 
-const mergeScreens = ref(false);
 const retainDays = ref(30);
 const captureInterval = ref(60);
 const timelineZoom = ref(1.5);
@@ -145,7 +144,6 @@ onMounted(async () => {
     dbPath.value = dPath as string;
     isSetupComplete.value = true;
     await invoke("update_db_path", { path: dbPath.value });
-    mergeScreens.value = (await store.get("mergeScreens")) as boolean || false;
     retainDays.value = (await store.get("retainDays")) as number || 30;
     captureInterval.value = Math.max((await store.get("captureInterval")) as number || 60, 60);
     timelineZoom.value = (await store.get("timelineZoom")) as number || 1.5;
@@ -322,7 +320,6 @@ const handleTimelineWheel = (e: WheelEvent) => {
 const updateSettings = async () => {
   await store.set("savePath", savePath.value);
   await store.set("dbPath", dbPath.value);
-  await store.set("mergeScreens", mergeScreens.value); 
   await store.set("retainDays", retainDays.value);
   await store.set("captureInterval", captureInterval.value); 
   await store.set("timelineZoom", timelineZoom.value);
@@ -706,7 +703,6 @@ const handleExport = async () => {
         <div class="p-10 space-y-8">
           <div class="space-y-3"><label class="text-xs font-bold text-[#86868B]">截图保存位置</label><div class="flex gap-2"><input type="text" readonly :value="savePath" class="flex-1 bg-[#F2F2F7] rounded-xl px-4 py-2 text-sm outline-none" /><button @click="selectFolder(); updateSettings()" class="bg-white border p-2 rounded-xl hover:border-[#007AFF] transition-all"><FolderOpen :size="18" /></button></div></div>
           <div class="space-y-3"><label class="text-xs font-bold text-[#86868B]">数据库文件</label><div class="flex gap-2"><input type="text" readonly :value="dbPath" class="flex-1 bg-[#F2F2F7] rounded-xl px-4 py-2 text-sm outline-none" /><div class="flex gap-1"><button @click="selectDBFile().then(updateSettings)" title="打开现有" class="bg-white border p-2 rounded-xl hover:border-[#007AFF] transition-all"><FolderOpen :size="18" /></button><button @click="createDBFile().then(updateSettings)" title="新建" class="bg-white border p-2 rounded-xl hover:border-[#007AFF] transition-all"><Plus :size="18" /></button></div></div></div>
-          <div class="flex items-center justify-between p-4 bg-[#F2F2F7] rounded-3xl"><div class="space-y-0.5"><div class="font-bold">多屏合并</div></div><button @click="mergeScreens = !mergeScreens; updateSettings()" class="w-12 h-6 rounded-full relative transition-all" :class="mergeScreens ? 'bg-[#34C759]' : 'bg-[#E5E5E7]'"><div class="absolute top-1 left-1 w-4 h-4 bg-white rounded-full transition-all" :style="{ transform: mergeScreens ? 'translateX(24px)' : 'translateX(0)' }"></div></button></div>
           <div class="space-y-2"><div class="flex justify-between"><label class="text-xs font-bold">截图间隔</label><span class="text-xs font-bold text-[#007AFF]">{{ captureInterval }}s</span></div><input type="range" v-model.number="captureInterval" min="60" max="600" step="10" @change="updateSettings" class="w-full h-1 bg-[#E5E5E7] accent-[#007AFF]" /></div>
           <div class="space-y-2"><div class="flex justify-between"><label class="text-xs font-bold">清理策略</label><span class="text-xs font-bold text-[#007AFF]">{{ retainDays }}天</span></div><input type="range" v-model.number="retainDays" min="1" max="180" @change="updateSettings" class="w-full h-1 bg-[#E5E5E7] accent-[#007AFF]" /></div>
         </div>