Merge pull request #69 from dado3212/CrashFix

v1.9.0
dado3212 · Sep 23, 2020 · 31aeb73 · 31aeb73
2 parents 838f61d + 5d38329
commit 31aeb73
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/SpacesRenamer/ViewController.swift b/SpacesRenamer/ViewController.swift
@@ -19,7 +19,8 @@ class ViewController: NSViewController {
 
   var monitorPairings: [[NSScrollView: [DesktopSnippet]]] = []
 
-  let widthInDesktops = 6
+  var widthInDesktops = 6
+  let desktopWidth = 140.0
 
   override func viewDidLoad() {
     super.viewDidLoad()
@@ -63,6 +64,14 @@ class ViewController: NSViewController {
 
     // Get the # of spaces in the maximum monitor
     let maxSpacesPerMonitor = allMonitors.reduce(Int.min, { max($0, (($1 as? NSDictionary)?.value(forKey: "Spaces") as! NSArray).count) })
+
+
+    guard let mainScreen = NSScreen.main else {
+      fatalError("Bugged")
+    }
+    // Maximize the number of desktops
+    let screenWidth = Double(mainScreen.visibleFrame.width)
+    widthInDesktops = Int(screenWidth / desktopWidth) - 1
 
     // For each monitor
     for j in 1...allMonitors.count {
@@ -202,7 +211,7 @@ class ViewController: NSViewController {
               maxSpacesPerMonitor == 1 ? 2 : 1, // minimum width of two spaces so the buttons render correctly
               allSpaces.count
           ))
-          ) * 140.0 + 10.0
+          ) * desktopWidth + 10.0
       ))
       constraints.append(widthConstraint)
       self.view.addConstraints([widthConstraint])

diff --git a/build/spaces-renamer.zip b/build/spaces-renamer.zip
diff --git a/spaces-renamer.xcodeproj/project.pbxproj b/spaces-renamer.xcodeproj/project.pbxproj
@@ -333,7 +333,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/spaces-renamer/Info.plist";
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
-				MARKETING_VERSION = 1.8.1;
+				MARKETING_VERSION = 1.9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.alexbeals.spaces-renamer";
 				PRODUCT_NAME = "spaces-renamer";
 				WRAPPER_EXTENSION = bundle;
@@ -352,7 +352,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/spaces-renamer/Info.plist";
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
-				MARKETING_VERSION = 1.8.1;
+				MARKETING_VERSION = 1.9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.alexbeals.spaces-renamer";
 				PRODUCT_NAME = "spaces-renamer";
 				WRAPPER_EXTENSION = bundle;
@@ -465,7 +465,7 @@
 				INFOPLIST_FILE = SpacesRenamer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.8.1;
+				MARKETING_VERSION = 1.9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alexbeals.SpacesRenamer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -516,7 +516,7 @@
 				INFOPLIST_FILE = SpacesRenamer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.8.1;
+				MARKETING_VERSION = 1.9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alexbeals.SpacesRenamer;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/spaces-renamer/spacesRenamer.m b/spaces-renamer/spacesRenamer.m
@@ -121,22 +121,27 @@ static void overrideTextLayer(CALayer *view, NSString *newString, double width,
 
 // Gets the text area, and renders how large it would be with the new dimensions
 // Uses this for calculating how far they should be offset by
+static double getTextSizeHelper(CATextLayer *textLayer, NSString *string) {
+  CFRange textRange = CFRangeMake(0, string.length);
+  CFMutableAttributedStringRef attributedString = CFAttributedStringCreateMutable(kCFAllocatorDefault, string.length);
+  CFAttributedStringReplaceString(attributedString, CFRangeMake(0, 0), (CFStringRef) string);
+  CFAttributedStringSetAttribute(attributedString, textRange, kCTFontAttributeName, ((CATextLayer *)textLayer).font);
+  CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString(attributedString);
+  CFRange fitRange;
+  CGSize frameSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetter, textRange, NULL, CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX), &fitRange);
+  CFRelease(framesetter);
+  CFRelease(attributedString);
+  return frameSize.width;
+}
+
 static double getTextSize(CALayer *view, NSString *string) {
-  double textSize = -1;
   CATextLayer *textLayer = getTextLayer(view);
   if (textLayer != nil) {
-    CFRange textRange = CFRangeMake(0, string.length);
-    CFMutableAttributedStringRef attributedString = CFAttributedStringCreateMutable(kCFAllocatorDefault, string.length);
-    CFAttributedStringReplaceString(attributedString, CFRangeMake(0, 0), (CFStringRef) string);
-    CFAttributedStringSetAttribute(attributedString, textRange, kCTFontAttributeName, ((CATextLayer *)textLayer).font);
-    CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString(attributedString);
-    CFRange fitRange;
-    CGSize frameSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetter, textRange, NULL, CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX), &fitRange);
-    CFRelease(framesetter);
-    CFRelease(attributedString);
-    return frameSize.width;
+    // Works around bug where CTFramesetterSuggestFrameSizeWithConstraints returns 0 for
+    // strings entirely composed of whitespace
+    return getTextSizeHelper(textLayer, [string stringByAppendingString:@".."]) - getTextSizeHelper(textLayer, @".");
   }
-  return textSize;
+  return -1;
 }
 
 // The highlighted space has 2 sublayers, while as a normal space only has 1
@@ -195,6 +200,7 @@ static int getSelected(NSArray<CALayer *> *views) {
 ZKSwizzleInterface(_SRCALayer, CALayer, CALayer);
 @implementation _SRCALayer
 - (void)setFrame:(CGRect)arg1 {
+  CGRect orig = arg1;
   id possibleWidth = objc_getAssociatedObject(self, &OVERRIDDEN_WIDTH);
   if (possibleWidth && [possibleWidth isKindOfClass:[NSNumber class]] && self.class == NSClassFromString(@"CALayer")) {
     arg1.size.width = [possibleWidth doubleValue] + 20;
@@ -225,6 +231,9 @@ - (void)setFrame:(CGRect)arg1 {
       }
     }
   }
+  if (arg1.size.width == 0.0 && orig.size.width != 0.0) {
+    return ZKOrig(void, orig);
+  }
 
   return ZKOrig(void, arg1);
 }