fixed reset + display type detection

Author: existancepy

src/modules/macro.py

@@ -1094,6 +1094,8 @@ def reset(self, hiveCheck = False, convert = True, AFB = False):
             self.keyboard.press('esc')
             time.sleep(0.2)
             self.keyboard.press('r')
+            time.sleep(0.2)
+            self.keyboard.press('w')
             time.sleep(0.25)
             self.keyboard.press('enter')
             print(f"pressed reset keys: {time.time()-st}")

src/modules/screen/screenData.py

@@ -4,6 +4,8 @@
 import subprocess
 import sys
 import os
+import mss
+from PIL import Image
 from ..misc import settingsManager
 screenPath = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../data/user/screen.txt'))
 def setScreenData():
@@ -47,10 +49,13 @@ def setScreenData():
     #for macs: check if its reina, set the screen width and height, set multipliers
     if sys.platform == "darwin":
         #get a screenshot. The size of the screenshot is the true screen size
-        sh, sw, _ = np.array(pag.screenshot()).shape
-        if whd*2 == sh: #check if retina (screenshot size is twice pyautogui's size)
-            screenData["screen_width"] = sw
-            screenData["screen_height"] = sh
+        sct=mss.mss()
+        region={'top':0,'left':0,'width':150,'height':150}
+        shot=sct.grab(region)
+        sw, sh = shot.width, shot.height
+        if sw == 300: #check if retina (screenshot size is twice)
+            screenData["screen_width"] *= 2
+            screenData["screen_height"] *= 2
             screenData["display_type"] = "retina"
         ndisplay = "{}x{}".format(sw,sh)
         #get multipliers

src/webapp/htmlImports/persistent/header.html

@@ -1,6 +1,6 @@
 <div style="width: 98%; background-color: #202225; display: flex; padding: 0.3rem 1rem; align-items: center;">
     <img src="./assets/general/icon.png" style="height: 2.6rem;">
     <h1 class="poppins-semibold" style="font-size: 1.3rem; margin-left: 1rem;">Existance Macro</h1>
-    <div class="poppins-medium" style="font-size: 1.1rem; margin-left: auto;" id = "update">v2.0.0 - Update 12.8</div>
+    <div class="poppins-medium" style="font-size: 1.1rem; margin-left: auto;" id = "update">v2.0.0 - Update 12.9</div>
 </div>