Fixed sixths & ninths calculations on the right side of the screen th…

…at were off by a pixel.
rxhanson · Jun 4, 2024 · a886dda · a886dda
1 parent 8074ce6
commit a886dda
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Rectangle/WindowCalculation/BottomRightNinthCalculation.swift b/Rectangle/WindowCalculation/BottomRightNinthCalculation.swift
@@ -36,7 +36,7 @@ class BottomRightNinthCalculation: WindowCalculation, OrientationAware, NinthsRe
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
         rect.origin.y = visibleFrameOfScreen.minY
-        rect.origin.x = visibleFrameOfScreen.minX + (2.0 * rect.width)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .bottomRightNinth)
     }
 
@@ -45,7 +45,7 @@ class BottomRightNinthCalculation: WindowCalculation, OrientationAware, NinthsRe
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
         rect.origin.y = visibleFrameOfScreen.minY
-        rect.origin.x = visibleFrameOfScreen.minX + (2.0 * rect.width)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .bottomRightNinth)
     }
 }

diff --git a/Rectangle/WindowCalculation/BottomRightSixthCalculation.swift b/Rectangle/WindowCalculation/BottomRightSixthCalculation.swift
@@ -37,15 +37,15 @@ class BottomRightSixthCalculation: WindowCalculation, OrientationAware, SixthsRe
         var rect = visibleFrameOfScreen
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 2.0)
-        rect.origin.x = visibleFrameOfScreen.origin.x + (rect.width * 2)
+        rect.origin.x = visibleFrameOfScreen.origin.x + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .bottomRightSixthLandscape)
     }
 
     func portraitRect(_ visibleFrameOfScreen: CGRect) -> RectResult {
         var rect = visibleFrameOfScreen
         rect.size.width = floor(visibleFrameOfScreen.width / 2.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
-        rect.origin.x = visibleFrameOfScreen.origin.x + (rect.width * 2)
+        rect.origin.x = visibleFrameOfScreen.origin.x + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .bottomRightSixthPortrait)
     }
 }
diff --git a/Rectangle/WindowCalculation/MiddleRightNinthCalculation.swift b/Rectangle/WindowCalculation/MiddleRightNinthCalculation.swift
@@ -36,7 +36,7 @@ class MiddleRightNinthCalculation: WindowCalculation, OrientationAware, NinthsRe
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
         rect.origin.y = visibleFrameOfScreen.minY + rect.height
-        rect.origin.x = visibleFrameOfScreen.minX + (2.0 * rect.width)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .middleRightNinth)
     }
 
@@ -45,7 +45,7 @@ class MiddleRightNinthCalculation: WindowCalculation, OrientationAware, NinthsRe
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
         rect.origin.y = visibleFrameOfScreen.minY + rect.height
-        rect.origin.x = visibleFrameOfScreen.minX + (2.0 * rect.width)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .middleRightNinth)
     }
 }

diff --git a/Rectangle/WindowCalculation/TopRightNinthCalculation.swift b/Rectangle/WindowCalculation/TopRightNinthCalculation.swift
@@ -36,7 +36,7 @@ class TopRightNinthCalculation: WindowCalculation, OrientationAware, NinthsRepea
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
         rect.origin.y = visibleFrameOfScreen.maxY - rect.height
-        rect.origin.x = visibleFrameOfScreen.minX + (2.0 * rect.width)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .topRightNinth)
     }
 
@@ -45,7 +45,7 @@ class TopRightNinthCalculation: WindowCalculation, OrientationAware, NinthsRepea
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 3.0)
         rect.origin.y = visibleFrameOfScreen.maxY - rect.height
-        rect.origin.x = visibleFrameOfScreen.minX + (2.0 * rect.width)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         return RectResult(rect, subAction: .topRightNinth)
     }
 }

diff --git a/Rectangle/WindowCalculation/TopRightSixthCalculation.swift b/Rectangle/WindowCalculation/TopRightSixthCalculation.swift
@@ -36,7 +36,7 @@ class TopRightSixthCalculation: WindowCalculation, OrientationAware, SixthsRepea
         var rect = visibleFrameOfScreen
         rect.size.width = floor(visibleFrameOfScreen.width / 3.0)
         rect.size.height = floor(visibleFrameOfScreen.height / 2.0)
-        rect.origin.x = visibleFrameOfScreen.minX + (rect.width * 2.0)
+        rect.origin.x = visibleFrameOfScreen.minX + visibleFrameOfScreen.width - rect.width
         rect.origin.y = visibleFrameOfScreen.maxY - rect.height
         return RectResult(rect, subAction: .topRightSixthLandscape)
     }