feat: center cursor in focused app (#16)

Resolves #12
wojciech-kulik · Jan 24, 2025 · 2223a0f · 2223a0f
1 parent bc287cf
commit 2223a0f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 7 deletions.
diff --git a/FlashSpace.xcodeproj/project.pbxproj b/FlashSpace.xcodeproj/project.pbxproj
@@ -423,7 +423,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = ZL6756Q8Q2;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -437,7 +437,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 0.4.5;
+				MARKETING_VERSION = 0.5.6;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.wojciechkulik.FlashSpace.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)-Dev";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -454,7 +454,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = JT56B63DU5;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -468,7 +468,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 0.4.5;
+				MARKETING_VERSION = 0.5.6;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.wojciechkulik.FlashSpace;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/FlashSpace/Focus/FocusManager.swift b/FlashSpace/Focus/FocusManager.swift
@@ -110,6 +110,13 @@ final class FocusManager {
         toFocus?.window.focus()
         toFocus?.app.activate()
         toFocus?.window.focus()
+        centerCursorIfNeeded(in: toFocus?.frame)
+    }
+
+    private func centerCursorIfNeeded(in frame: CGRect?) {
+        guard settingsRepository.centerCursorOnFocusChange, let frame else { return }
+
+        CGWarpMouseCursorPosition(CGPoint(x: frame.midX, y: frame.midY))
     }
 
     private func getFocusedAppIndex() -> (Int, [String])? {

diff --git a/FlashSpace/Settings/FocusSettingsView.swift b/FlashSpace/Settings/FocusSettingsView.swift
@@ -16,6 +16,10 @@ struct FocusSettingsView: View {
                 Toggle("Enable Focus Manager", isOn: $settings.enableFocusManagement)
             }
 
+            Section {
+                Toggle("Center Cursor In Focused App", isOn: $settings.centerCursorOnFocusChange)
+            }
+
             Section {
                 hotkey("Focus Left", for: $settings.focusLeft)
                 hotkey("Focus Right", for: $settings.focusRight)

diff --git a/FlashSpace/Settings/SettingsRepository.swift b/FlashSpace/Settings/SettingsRepository.swift
@@ -10,13 +10,15 @@ import Foundation
 
 struct AppSettings: Codable {
     var enableFocusManagement: Bool?
+    var centerCursorOnFocusChange: Bool?
     var focusLeft: HotKeyShortcut?
     var focusRight: HotKeyShortcut?
     var focusUp: HotKeyShortcut?
     var focusDown: HotKeyShortcut?
     var focusNextWorkspaceApp: HotKeyShortcut?
     var focusPreviousWorkspaceApp: HotKeyShortcut?
 
+    var centerCursorOnWorkspaceChange: Bool?
     var switchToPreviousWorkspace: HotKeyShortcut?
     var switchToNextWorkspace: HotKeyShortcut?
     var unassignFocusedApp: HotKeyShortcut?
@@ -30,7 +32,11 @@ final class SettingsRepository: ObservableObject {
 
     // MARK: - Focus Manager
 
-    @Published var enableFocusManagement: Bool = true {
+    @Published var enableFocusManagement: Bool = false {
+        didSet { updateSettings() }
+    }
+
+    @Published var centerCursorOnFocusChange: Bool = false {
         didSet { updateSettings() }
     }
 
@@ -60,6 +66,10 @@ final class SettingsRepository: ObservableObject {
 
     // MARK: - Workspaces
 
+    @Published var centerCursorOnWorkspaceChange: Bool = false {
+        didSet { updateSettings() }
+    }
+
     @Published var switchToPreviousWorkspace: HotKeyShortcut? {
         didSet { updateSettings() }
     }
@@ -108,15 +118,19 @@ final class SettingsRepository: ObservableObject {
 
         currentSettings = AppSettings(
             enableFocusManagement: enableFocusManagement,
+            centerCursorOnFocusChange: centerCursorOnFocusChange,
             focusLeft: focusLeft,
             focusRight: focusRight,
             focusUp: focusUp,
             focusDown: focusDown,
             focusNextWorkspaceApp: focusNextWorkspaceApp,
             focusPreviousWorkspaceApp: focusPreviousWorkspaceApp,
+
+            centerCursorOnWorkspaceChange: centerCursorOnWorkspaceChange,
             switchToPreviousWorkspace: switchToPreviousWorkspace,
             switchToNextWorkspace: switchToNextWorkspace,
             unassignFocusedApp: unassignFocusedApp,
+
             enableIntegrations: enableIntegrations,
             runScriptOnWorkspaceChange: runScriptOnWorkspaceChange
         )
@@ -139,14 +153,16 @@ final class SettingsRepository: ObservableObject {
 
         currentSettings = settings
 
-        enableFocusManagement = settings.enableFocusManagement ?? true
+        enableFocusManagement = settings.enableFocusManagement ?? false
+        centerCursorOnFocusChange = settings.centerCursorOnFocusChange ?? false
         focusLeft = settings.focusLeft
         focusRight = settings.focusRight
         focusUp = settings.focusUp
         focusDown = settings.focusDown
         focusNextWorkspaceApp = settings.focusNextWorkspaceApp
         focusPreviousWorkspaceApp = settings.focusPreviousWorkspaceApp
 
+        centerCursorOnWorkspaceChange = settings.centerCursorOnWorkspaceChange ?? false
         switchToPreviousWorkspace = settings.switchToPreviousWorkspace
         switchToNextWorkspace = settings.switchToNextWorkspace
         unassignFocusedApp = settings.unassignFocusedApp

diff --git a/FlashSpace/Settings/WorkspacesSettingsView.swift b/FlashSpace/Settings/WorkspacesSettingsView.swift
@@ -12,6 +12,13 @@ struct WorkspacesSettingsView: View {
 
     var body: some View {
         Form {
+            Section(
+                footer: Text("This feature is triggered when the workspace is changed using hotkeys.")
+                    .foregroundStyle(.secondary)
+            ) {
+                Toggle("Center Cursor In Focused App", isOn: $settings.centerCursorOnWorkspaceChange)
+            }
+
             Section(
                 footer: Text("These shortcuts cycle through workspaces on the display with the cursor.")
                     .foregroundStyle(.secondary)

diff --git a/FlashSpace/Workspaces/WorkspaceManager.swift b/FlashSpace/Workspaces/WorkspaceManager.swift
@@ -92,7 +92,9 @@ final class WorkspaceManager {
         if setFocus {
             let appToFocus = appsToShow.first { $0.localizedName == workspace.appToFocus }
             let lastApp = appsToShow.first { $0.localizedName == workspace.apps.last }
-            (appToFocus ?? lastApp)?.focus()
+            let toFocus = appToFocus ?? lastApp
+            toFocus?.focus()
+            centerCursorIfNeeded(in: toFocus?.getFrame())
         }
     }
 
@@ -109,6 +111,12 @@ final class WorkspaceManager {
             app.hide()
         }
     }
+
+    private func centerCursorIfNeeded(in frame: CGRect?) {
+        guard settingsRepository.centerCursorOnWorkspaceChange, let frame else { return }
+
+        CGWarpMouseCursorPosition(CGPoint(x: frame.midX, y: frame.midY))
+    }
 }
 
 extension WorkspaceManager {