fix: change default column to auto

libnyanpasu · Dec 14, 2022 · 6e421e6 · 6e421e6
1 parent 8385050
commit 6e421e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs
@@ -120,7 +120,6 @@ impl IVerge {
             proxy_guard_duration: Some(30),
             auto_close_connection: Some(true),
             enable_builtin_enhanced: Some(true),
-            proxy_layout_column: Some(1),
             ..Self::default()
         }
     }

diff --git a/src/components/proxy/use-render-list.ts b/src/components/proxy/use-render-list.ts
@@ -31,10 +31,10 @@ export const useRenderList = (mode: string) => {
   const { verge } = useVerge();
   const { width } = useWindowWidth();
 
-  let col = verge?.proxy_layout_column || 1;
+  let col = Math.floor(verge?.proxy_layout_column || 6);
 
   // 自适应
-  if (col === 6) {
+  if (col >= 6 || col <= 0) {
     if (width > 1450) col = 5;
     else if (width > 1024) col = 4;
     else if (width > 900) col = 3;

diff --git a/src/components/setting/mods/misc-viewer.tsx b/src/components/setting/mods/misc-viewer.tsx
@@ -21,7 +21,7 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
   const [values, setValues] = useState({
     autoCloseConnection: false,
     enableBuiltinEnhanced: true,
-    proxyLayoutColumn: 1,
+    proxyLayoutColumn: 6,
     defaultLatencyTest: "",
   });
 
@@ -31,7 +31,7 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
       setValues({
         autoCloseConnection: verge?.auto_close_connection ?? false,
         enableBuiltinEnhanced: verge?.enable_builtin_enhanced ?? true,
-        proxyLayoutColumn: verge?.proxy_layout_column || 1,
+        proxyLayoutColumn: verge?.proxy_layout_column || 6,
         defaultLatencyTest: verge?.default_latency_test || "",
       });
     },