Address more feedback.

kasper · Jun 8, 2024 · 1de31d8 · 1de31d8
1 parent e7c10cd
commit 1de31d8
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Phoenix/PHSpace.m b/Phoenix/PHSpace.m
@@ -70,7 +70,7 @@ @implementation PHSpace
 void CGSMoveWindowsToManagedSpace(CGSConnectionID connection, CFArrayRef windowIds, CGSSpaceID spaceId);
 
 // XXX: Undocumented private API to set a space’s (legacy) compatId
-CGError CGSSpaceSetCompatID(CGSConnectionID connection, CGSSpaceID spaceId, CGSMoveWindowCompatID compatID);
+CGError CGSSpaceSetCompatID(CGSConnectionID connection, CGSSpaceID spaceId, CGSMoveWindowCompatID compatId);
 
 // XXX: Undocumented private API to move the given windows (CGWindowIDs) to the given space by its (legacy) compatId
 CGError CGSSetWindowListWorkspace(CGSConnectionID connection,
@@ -237,17 +237,6 @@ - (void)removeWindows:(NSArray<PHWindow *> *)windows {
                                (__bridge CFArrayRef) @[@(self.identifier)]);
 }
 
-- (void)moveWindows:(NSArray<PHWindow *> *)windows {
-    if (![NSProcessInfo isOperatingSystemAtLeastSonoma145]) {
-        CGSMoveWindowsToManagedSpace(
-            CGSMainConnectionID(), (__bridge CFArrayRef)[self identifiersForWindows:windows], self.identifier);
-        return;
-    }
-
-    // CGSMoveWindowsToManagedSpace is broken in MacOS 14.5, so use the legacy Compat ID API instead.
-    [self moveWindowsWithCompatId:windows];
-}
-
 /**
  * - https://github.com/kasper/phoenix/issues/348
  * - https://github.com/koekeishiya/yabai/issues/2240#issuecomment-2116326165
@@ -268,4 +257,15 @@ - (void)moveWindowsWithCompatId:(NSArray<PHWindow *> *)windows {
     CGSSpaceSetCompatID(connection, self.identifier, 0x0);
 }
 
+- (void)moveWindows:(NSArray<PHWindow *> *)windows {
+    if (![NSProcessInfo isOperatingSystemAtLeastSonoma145]) {
+        CGSMoveWindowsToManagedSpace(
+            CGSMainConnectionID(), (__bridge CFArrayRef)[self identifiersForWindows:windows], self.identifier);
+        return;
+    }
+
+    // CGSMoveWindowsToManagedSpace is broken in MacOS 14.5, so use the legacy Compat ID API instead.
+    [self moveWindowsWithCompatId:windows];
+}
+
 @end