Cursors no longer lazy load on osx, reinitialize after reset

srkrambo · Dec 31, 2018 · cdd2bba · cdd2bba
1 parent f64cbde
commit cdd2bba
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 20 deletions.
diff --git a/Mousecape/Mousecape.xcodeproj/project.pbxproj b/Mousecape/Mousecape.xcodeproj/project.pbxproj
@@ -1125,7 +1125,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Mousecape/Mousecape-Prefix.pch";
 				INFOPLIST_FILE = "Mousecape/Mousecape-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
@@ -1143,7 +1143,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Mousecape/Mousecape-Prefix.pch";
 				INFOPLIST_FILE = "Mousecape/Mousecape-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;

diff --git a/Mousecape/Mousecape/Images.xcassets/HDTemplate.imageset/Contents.json b/Mousecape/Mousecape/Images.xcassets/HDTemplate.imageset/Contents.json
@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "HDTemplate.png"
+      "filename" : "HDTemplate.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/Mousecape/Mousecape/Images.xcassets/SDTemplate.imageset/Contents.json b/Mousecape/Mousecape/Images.xcassets/SDTemplate.imageset/Contents.json
@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "SDTemplate.png"
+      "filename" : "SDTemplate.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/Mousecape/Mousecape/Images.xcassets/applied.imageset/Contents.json b/Mousecape/Mousecape/Images.xcassets/applied.imageset/Contents.json
@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "applied.png"
+      "filename" : "applied.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/Mousecape/Mousecape/Images.xcassets/dropzone.imageset/Contents.json b/Mousecape/Mousecape/Images.xcassets/dropzone.imageset/Contents.json
@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "dz.png"
+      "filename" : "dz.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/Mousecape/Mousecape/Mousecape-Info.plist b/Mousecape/Mousecape/Mousecape-Info.plist
@@ -40,7 +40,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1640</string>
+	<string>1656</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Mousecape/mousecloak/restore.m b/Mousecape/mousecloak/restore.m
@@ -44,7 +44,12 @@ void resetAllCursors() {
     MMLog("Restoring core cursors...");
     if (CoreCursorUnregisterAll(CGSMainConnectionID()) == 0) {
         MCSetDefault(NULL, MCPreferencesAppliedCursorKey);
+
+        for (int x = 0; x < 45; x++) {
+            CoreCursorSet(CGSMainConnectionID(), x);
+        }
+
         MMLog(BOLD GREEN "Successfully restored all cursors." RESET);
     } else
         MMLog(BOLD RED "Received an error while restoring core cursors." RESET);
-}
+}