Attempt to handle thirds in a bit more loosely.

adamm · Apr 17, 2015 · 50831e5 · 50831e5
1 parent c72665c
commit 50831e5
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Spectacle/SpectacleWindowPositionManager.m b/Spectacle/SpectacleWindowPositionManager.m
@@ -242,14 +242,6 @@ - (void)moveWindowRect: (CGRect)windowRect frameOfScreen: (CGRect)frameOfScreen
     [self moveWindowRect: windowRect frontMostWindowElement: frontMostWindowElement];
 
     CGRect movedWindowRect = [self rectOfWindowWithAccessibilityElement: frontMostWindowElement];
-
-    if (MovingToThirdOfDisplay(action) && !RectCenteredWithinRect(movedWindowRect, windowRect)) {
-        NSBeep();
-
-        [self moveWindowRect: previousWindowRect frontMostWindowElement: frontMostWindowElement];
-
-        return;
-    }
 
     if ((action != SpectacleWindowActionUndo) && (action != SpectacleWindowActionRedo)) {
         [self moveWindowRect:windowRect frontMostWindowElement: frontMostWindowElement];
@@ -292,6 +284,12 @@ - (void)moveWindowRect: (CGRect)windowRect frameOfScreen: (CGRect)frameOfScreen
             [self moveWindowRect: adjustedWindowRect frontMostWindowElement: frontMostWindowElement];
         }
     }
+
+    if (MovingToThirdOfDisplay(action) && !CGRectContainsRect(windowRect, movedWindowRect)) {
+        NSBeep();
+
+        [self moveWindowRect: previousWindowRect frontMostWindowElement: frontMostWindowElement];
+    }
 }
 
 - (void)moveWindowRect: (CGRect)windowRect frontMostWindowElement: (ZKAccessibilityElement *)frontMostWindowElement {