Merge pull request #20 from dado3212/Fullscreen

Fix for desktop views with the expanding desktop views
dado3212 · May 23, 2018 · c5415f2 · c5415f2
2 parents 21e059e + 0f4909d
commit c5415f2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/build/spaces-renamer.zip b/build/spaces-renamer.zip
diff --git a/...eproj/project.xcworkspace/xcuserdata/alexbeals.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/alexbeals.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/spaces-renamer/Info.plist b/spaces-renamer/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/spaces-renamer/spacesRenamer.m b/spaces-renamer/spacesRenamer.m
@@ -173,8 +173,10 @@ - (void)setBounds:(CGRect)arg1 {
         NSArray<CALayer *> *unexpandedViews = self.sublayers[3].sublayers[0].sublayers;
         NSArray<CALayer *> *expandedViews = self.sublayers[3].sublayers[1].sublayers;
 
+        int numMonitors = MAX(unexpandedViews.count, expandedViews.count);
+
         // Get which of the spaces in the current dock is selected
-        int selected = getSelected(unexpandedViews);
+        int selected = getSelected((!unexpandedViews || !unexpandedViews.count) ? expandedViews : unexpandedViews);
 
         // Get all of the names
         NSMutableArray* names = getNamesFromPlist();
@@ -183,7 +185,7 @@ - (void)setBounds:(CGRect)arg1 {
         NSMutableArray *possibleMonitors = [[NSMutableArray alloc] init];
         for (int i = 0; i < names.count; i++) {
             if (
-                ((NSArray *)names[i]).count == unexpandedViews.count && // Same number of monitors
+                ((NSArray *)names[i]).count == numMonitors && // Same number of monitors
                 [names[i][selected][@"selected"] boolValue] // Same index is selected
             ) {
                 [possibleMonitors addObject:[NSNumber numberWithInt:i]];
@@ -199,9 +201,13 @@ - (void)setBounds:(CGRect)arg1 {
         monitorIndex = monitorIndex % names.count;
 
         for (int i = 0; i < ((NSArray*)names[monitorIndex]).count; i++) {
-            if (names[monitorIndex][i][@"name"] != nil && ![names[monitorIndex][i][@"name"] isEqualToString:@""] && i < unexpandedViews.count) {
-                setTextLayer(expandedViews[i], names[monitorIndex][i][@"name"]);
-                setTextLayer(unexpandedViews[i], names[monitorIndex][i][@"name"]);
+            if (names[monitorIndex][i][@"name"] != nil && ![names[monitorIndex][i][@"name"] isEqualToString:@""]) {
+                if (i < expandedViews.count) {
+                    setTextLayer(expandedViews[i], names[monitorIndex][i][@"name"]);
+                }
+                if (i < unexpandedViews.count) {
+                    setTextLayer(unexpandedViews[i], names[monitorIndex][i][@"name"]);
+                }
             }
         }