From de057e51751d73d02fe356b23d89ac001785ddc3 Mon Sep 17 00:00:00 2001
From: pompurin404 <pompurin404@mihomo.party>
Date: Sun, 25 Aug 2024 20:01:31 +0800
Subject: [PATCH] 1.0.5

---
 package.json                       |  2 +-
 src/main/index.ts                  |  2 +-
 src/renderer/src/pages/proxies.tsx | 33 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 6d68aea..55e429a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mihomo-party",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Mihomo Party",
   "main": "./out/main/index.js",
   "author": "mihomo-party",
diff --git a/src/main/index.ts b/src/main/index.ts
index 0e51234..b2d499f 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -16,7 +16,7 @@ import { createElevateTask } from './sys/misc'
 
 export let mainWindow: BrowserWindow | null = null
 
-if (process.platform === 'win32') {
+if (process.platform === 'win32' && !is.dev) {
   try {
     createElevateTask()
   } catch (e) {
diff --git a/src/renderer/src/pages/proxies.tsx b/src/renderer/src/pages/proxies.tsx
index 46a9602..4d2d5f0 100644
--- a/src/renderer/src/pages/proxies.tsx
+++ b/src/renderer/src/pages/proxies.tsx
@@ -61,7 +61,7 @@ const Proxies: React.FC = () => {
     })
 
     return { groupCounts, allProxies }
-  }, [groups, isOpen, proxyDisplayOrder])
+  }, [groups, isOpen, proxyDisplayOrder, cols])
 
   const onChangeProxy = async (group: string, proxy: string): Promise<void> => {
     await mihomoChangeProxy(group, proxy)
@@ -80,18 +80,15 @@ const Proxies: React.FC = () => {
     await mihomoGroupDelay(group, url)
   }
 
-  const calcCols = (): void => {
-    if (window.innerWidth >= 1280) {
-      setCols(4)
-      return
-    }
-    if (window.innerWidth >= 1024) {
-      setCols(3)
-      return
-    }
-    if (window.innerWidth >= 768) {
-      setCols(2)
-      return
+  const calcCols = (): number => {
+    if (window.matchMedia('(min-width: 1536px)').matches) {
+      return 5
+    } else if (window.matchMedia('(min-width: 1280px)').matches) {
+      return 4
+    } else if (window.matchMedia('(min-width: 1024px)').matches) {
+      return 3
+    } else {
+      return 2
     }
   }
 
@@ -100,8 +97,10 @@ const Proxies: React.FC = () => {
       setCols(parseInt(proxyCols))
       return
     }
-    calcCols()
-    window.onresize = calcCols
+    setCols(calcCols())
+    window.onresize = (): void => {
+      setCols(calcCols())
+    }
     return (): void => {
       window.onresize = null
     }
@@ -259,7 +258,9 @@ const Proxies: React.FC = () => {
             innerIndex -= count
           })
           return allProxies[groupIndex] ? (
-            <div className={`grid grid-cols-${cols} gap-2 pt-2 mx-2`}>
+            <div
+              className={`grid ${proxyCols === 'auto' ? 'sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5' : `grid-cols-${cols}`} gap-2 pt-2 mx-2`}
+            >
               {Array.from({ length: cols }).map((_, i) => {
                 if (!allProxies[groupIndex][innerIndex * cols + i]) return null
                 return (