Merge branch 'feature' into main

ruittenb · Oct 10, 2024 · 3e7886b · 3e7886b
2 parents 2d3a383 + a0f8d19
commit 3e7886b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+1.6.18: Renamed 'normal' to 'medium'; added tick mark to menu
 1.6.17: Code refactoring
 1.6.16: Code refactoring
 1.6.15: Fixed crash when error handling after sending applescript command

diff --git a/Spaceman.xcodeproj/project.pbxproj b/Spaceman.xcodeproj/project.pbxproj
@@ -465,7 +465,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.17;
+				CURRENT_PROJECT_VERSION = 1.6.18;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -480,7 +480,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.17;
+				MARKETING_VERSION = 1.6.18;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -499,7 +499,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.17;
+				CURRENT_PROJECT_VERSION = 1.6.18;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -514,7 +514,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.17;
+				MARKETING_VERSION = 1.6.18;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Spaceman/Helpers/IconCreator.swift b/Spaceman/Helpers/IconCreator.swift
@@ -10,7 +10,7 @@ import Foundation
 import SwiftUI
 
 class IconCreator {
-    @AppStorage("layoutMode") private var layoutMode = LayoutMode.normal
+    @AppStorage("layoutMode") private var layoutMode = LayoutMode.medium
     @AppStorage("displayStyle") private var displayStyle = DisplayStyle.numbersAndRects
     @AppStorage("hideInactiveSpaces") private var hideInactiveSpaces = false
 

diff --git a/Spaceman/Model/LayoutMode.swift b/Spaceman/Model/LayoutMode.swift
@@ -8,5 +8,5 @@
 import Foundation
 
 enum LayoutMode: Int {
-    case compact, normal, large
+    case compact, medium, large
 }
diff --git a/Spaceman/Utilities/Constants.swift b/Spaceman/Utilities/Constants.swift
@@ -31,7 +31,7 @@ struct Constants {
             ICON_HEIGHT: 12,
             FONT_SIZE: 10
         ),
-        .normal: GuiSize(
+        .medium: GuiSize(
             GAP_WIDTH_SPACES: 5,
             GAP_WIDTH_DISPLAYS: 12,
             ICON_WIDTH_SMALL: 18,

diff --git a/Spaceman/View/PreferencesView.swift b/Spaceman/View/PreferencesView.swift
@@ -16,7 +16,7 @@ struct PreferencesView: View {
     @AppStorage("displayStyle") private var displayStyle = DisplayStyle.numbersAndRects
     @AppStorage("spaceNames") private var data = Data()
     @AppStorage("autoRefreshSpaces") private var autoRefreshSpaces = false
-    @AppStorage("layoutMode") private var layoutMode = LayoutMode.normal
+    @AppStorage("layoutMode") private var layoutMode = LayoutMode.medium
     @AppStorage("hideInactiveSpaces") private var hideInactiveSpaces = false
     @AppStorage("restartNumberingByDesktop") private var restartNumberingByDesktop = false
     @AppStorage("schema") private var keySet = KeySet.toprow
@@ -176,7 +176,7 @@ struct PreferencesView: View {
     private var layoutSizePicker: some View {
         Picker(selection: $layoutMode, label: Text("Layout size")) {
             Text("Compact").tag(LayoutMode.compact)
-            Text("Normal").tag(LayoutMode.normal)
+            Text("Medium").tag(LayoutMode.medium)
             Text("Large").tag(LayoutMode.large)
         }
         .pickerStyle(.segmented)

diff --git a/Spaceman/View/StatusBar.swift b/Spaceman/View/StatusBar.swift
@@ -182,11 +182,13 @@ class StatusBar: NSObject, NSMenuDelegate {
         item.image = menuIcon
         if space.isCurrentSpace || shortcutKey == "" {
             item.isEnabled = false
-            // item.state = NSControl.StateValue.on // tick mark
             //if OSVersion().exceeds(14, 0) {
             //if #available(macOS 14.0, *)  {
             //    item.badge = NSMenuItemBadge(string: "Current")
             //}
+            if space.isCurrentSpace {
+                item.state = .on // tick mark
+            }
         }
         return item
     }