Handle grouped zero-corner flips

Free Ruler.xcodeproj/project.pbxproj

@@ -32,13 +32,15 @@
 		50B1D3532D05D00100B1D135 /* RulerCursorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3522D05D00100B1D135 /* RulerCursorController.swift */; };
 		50B1D3552D05E00000B1D138 /* RulerTickLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3542D05E00000B1D138 /* RulerTickLayout.swift */; };
 		50B1D3592D06000100B1D139 /* AppIconRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3582D06000100B1D139 /* AppIconRenderer.swift */; };
-		50B1D3602D06000600B1D139 /* AppIconGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D35F2D06000600B1D139 /* AppIconGenerator.swift */; };
 		50B1D35D2D06000400B1D139 /* AppIconRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3582D06000100B1D139 /* AppIconRenderer.swift */; };
+		50B1D3602D06000600B1D139 /* AppIconGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D35F2D06000600B1D139 /* AppIconGenerator.swift */; };
 		50B1D3612D06000700B1D139 /* AppIconGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D35F2D06000600B1D139 /* AppIconGenerator.swift */; };
 		50B1D3652D06010100B1D139 /* AppStoreScreenshotPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3642D06010100B1D139 /* AppStoreScreenshotPreview.swift */; };
 		50B1D3662D06010200B1D139 /* AppStoreScreenshotPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3642D06010100B1D139 /* AppStoreScreenshotPreview.swift */; };
 		50B1D3672D06100000B1D13A /* ResizeHandleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3682D06100000B1D13A /* ResizeHandleView.swift */; };
 		50B1D3692D06100000B1D13A /* ResizeHandleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D3682D06100000B1D13A /* ResizeHandleView.swift */; };
+		50B1D36A2D06110000B1D13B /* UnitLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D36C2D06110000B1D13B /* UnitLabelView.swift */; };
+		50B1D36B2D06110000B1D13B /* UnitLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1D36C2D06110000B1D13B /* UnitLabelView.swift */; };
 		50C6D891228BDBAD0091F19E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50C6D890228BDBAD0091F19E /* Images.xcassets */; };
 		50D7BEE7227D42FD0008B95E /* RulerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50D7BEE6227D42FD0008B95E /* RulerController.swift */; };
 		50D7BEE9227D43270008B95E /* Ruler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50D7BEE8227D43270008B95E /* Ruler.swift */; };
@@ -118,6 +120,7 @@
 		50B1D35F2D06000600B1D139 /* AppIconGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconGenerator.swift; sourceTree = "<group>"; };
 		50B1D3642D06010100B1D139 /* AppStoreScreenshotPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStoreScreenshotPreview.swift; sourceTree = "<group>"; };
 		50B1D3682D06100000B1D13A /* ResizeHandleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResizeHandleView.swift; sourceTree = "<group>"; };
+		50B1D36C2D06110000B1D13B /* UnitLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitLabelView.swift; sourceTree = "<group>"; };
 		50C6D890228BDBAD0091F19E /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		50D7BEE6227D42FD0008B95E /* RulerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulerController.swift; sourceTree = "<group>"; };
 		50D7BEE8227D43270008B95E /* Ruler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Ruler.swift; sourceTree = "<group>"; };
@@ -139,7 +142,7 @@
 		8F629823243003EA004F9099 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		8F629825243003F6004F9099 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PreferencesController.xib; sourceTree = "<group>"; };
 		8F629828243003FF004F9099 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PreferencesController.strings; sourceTree = "<group>"; };
-		AB053EE93E1DC9AF341A8D4F /* Free Ruler.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "Free Ruler.app"; path = "Free Ruler.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AB053EE93E1DC9AF341A8D4F /* Free Ruler.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Free Ruler.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B894A5002BBFE61A005A3B6F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		B894A5012BBFE61A005A3B6F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/PreferencesController.strings; sourceTree = "<group>"; };
 		D9DBE8A12C791B1600A42589 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainMenu.strings; sourceTree = "<group>"; };
@@ -252,6 +255,7 @@
 				50D7BEEA227D432E0008B95E /* RulerWindow.swift */,
 				50D7BEEC227D5C810008B95E /* RuleView.swift */,
 				50B1D3682D06100000B1D13A /* ResizeHandleView.swift */,
+				50B1D36C2D06110000B1D13B /* UnitLabelView.swift */,
 				50B1D3542D05E00000B1D138 /* RulerTickLayout.swift */,
 				6F41029E22607DC900F06A10 /* HorizontalRule.swift */,
 				5012CAAC226AB09000BD9565 /* VerticalRule.swift */,
@@ -479,6 +483,7 @@
 				6F4102892260712F00F06A10 /* AppDelegate.swift in Sources */,
 				50D7BEED227D5C810008B95E /* RuleView.swift in Sources */,
 				50B1D3672D06100000B1D13A /* ResizeHandleView.swift in Sources */,
+				50B1D36A2D06110000B1D13B /* UnitLabelView.swift in Sources */,
 				50D7BEE9227D43270008B95E /* Ruler.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -504,6 +509,7 @@
 				23E2B80975F07733EB6CF5DB /* AppDelegate.swift in Sources */,
 				9A082BBC4A583513B0858C41 /* RuleView.swift in Sources */,
 				50B1D3692D06100000B1D13A /* ResizeHandleView.swift in Sources */,
+				50B1D36B2D06110000B1D13B /* UnitLabelView.swift in Sources */,
 				E6BC6663BAF0D11D7A9D2195 /* Ruler.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Free Ruler/AppDelegate.swift

@@ -34,6 +34,12 @@ private enum HotkeyBezelLocalizationKey: String {
     case rulersUngrouped = "HotkeyBezel.RulersUngrouped"
     case shadowEnabled = "HotkeyBezel.ShadowEnabled"
     case shadowDisabled = "HotkeyBezel.ShadowDisabled"
+    case horizontalOriginFormat = "HotkeyBezel.HorizontalOriginFormat"
+    case verticalOriginFormat = "HotkeyBezel.VerticalOriginFormat"
+    case originLeft = "HotkeyBezel.OriginLeft"
+    case originRight = "HotkeyBezel.OriginRight"
+    case originTop = "HotkeyBezel.OriginTop"
+    case originBottom = "HotkeyBezel.OriginBottom"
     case unitsFormat = "HotkeyBezel.UnitsFormat"
     case pixelsUnit = "Unit.Pixels.Abbreviation"
     case millimetersUnit = "Unit.Millimeters.Abbreviation"
@@ -57,6 +63,18 @@ private enum HotkeyBezelLocalizationKey: String {
             return "Hotkey status bezel text indicating ruler shadow is enabled"
         case .shadowDisabled:
             return "Hotkey status bezel text indicating ruler shadow is disabled"
+        case .horizontalOriginFormat:
+            return "Hotkey status bezel format for the horizontal ruler origin side"
+        case .verticalOriginFormat:
+            return "Hotkey status bezel format for the vertical ruler origin side"
+        case .originLeft:
+            return "Hotkey status bezel value for a ruler origin on the left"
+        case .originRight:
+            return "Hotkey status bezel value for a ruler origin on the right"
+        case .originTop:
+            return "Hotkey status bezel value for a ruler origin at the top"
+        case .originBottom:
+            return "Hotkey status bezel value for a ruler origin at the bottom"
         case .unitsFormat:
             return "Hotkey status bezel format for the selected measurement unit"
         case .pixelsUnit:
@@ -127,7 +145,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 #endif
 
         showRulers()
-
     }
 
 #if DEBUG
@@ -218,6 +235,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             prefs.observe(\Prefs.rulerColor, options: .new) { prefs, changed in
                 self.redrawRulers()
             },
+            prefs.observe(\Prefs.zeroCorner, options: .new) { prefs, changed in
+                self.redrawRulers()
+            },
         ]
     }
 
@@ -507,7 +527,108 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         toggleRuler(orientation: .vertical)
     }
 
-    func performRulerHotkey(keyCode: Int, sender: Any) -> Bool {
+    @IBAction func flipHorizontalRuler(_ sender: Any) {
+        flipRulers(along: .horizontal)
+        showHorizontalOriginHotkeyBezel(on: bezelScreen(for: sender))
+    }
+
+    @IBAction func flipVerticalRuler(_ sender: Any) {
+        flipRulers(along: .vertical)
+        showVerticalOriginHotkeyBezel(on: bezelScreen(for: sender))
+    }
+
+    func flipRulers(along orientation: Orientation) {
+        createRulersIfNeeded()
+
+        let oldGeometry = ZeroCornerGeometry(zeroCorner: prefs.zeroCorner)
+        let flippedCorner = prefs.zeroCorner.flipped(along: orientation)
+        let flippedRuler = existingRulerController(orientation: orientation)
+        let otherOrientation: Orientation = orientation == .horizontal ? .vertical : .horizontal
+        let otherRuler = existingRulerController(orientation: otherOrientation)
+        let zeroPointOffset = zeroPointOffset(
+            from: flippedRuler?.rulerWindow,
+            to: otherRuler?.rulerWindow,
+            geometry: oldGeometry
+        )
+
+        prefs.zeroCorner = flippedCorner
+
+        guard prefs.groupRulers,
+              let flippedWindow = flippedRuler?.rulerWindow,
+              let otherWindow = otherRuler?.rulerWindow,
+              isRulerWindowShown(otherWindow),
+              let zeroPointOffset = zeroPointOffset else { return }
+
+        let newGeometry = ZeroCornerGeometry(zeroCorner: flippedCorner)
+        let flippedZeroPoint = newGeometry.zeroPoint(in: flippedWindow.frame, for: orientation)
+        let targetOtherZeroPoint = NSPoint(
+            x: flippedZeroPoint.x + zeroPointOffset.width,
+            y: flippedZeroPoint.y + zeroPointOffset.height
+        )
+        let otherFrame = newGeometry.frame(
+            for: otherOrientation,
+            zeroPoint: targetOtherZeroPoint,
+            size: otherWindow.frame.size
+        )
+
+        detachRulerWindows()
+        otherWindow.setFrame(otherFrame, display: true)
+        updateRulerGrouping()
+    }
+
+    func isRulerWindowShown(_ window: RulerWindow) -> Bool {
+        return window.isVisible || window.parent != nil || rulers.contains {
+            $0.rulerWindow.childWindows?.contains(window) == true
+        }
+    }
+
+    private func zeroPointOffset(
+        from sourceWindow: RulerWindow?,
+        to targetWindow: RulerWindow?,
+        geometry: ZeroCornerGeometry
+    ) -> NSSize? {
+        guard let sourceWindow = sourceWindow,
+              let targetWindow = targetWindow else { return nil }
+
+        let sourceZeroPoint = geometry.zeroPoint(
+            in: sourceWindow.frame,
+            for: sourceWindow.ruler.orientation
+        )
+        let targetZeroPoint = geometry.zeroPoint(
+            in: targetWindow.frame,
+            for: targetWindow.ruler.orientation
+        )
+
+        return NSSize(
+            width: targetZeroPoint.x - sourceZeroPoint.x,
+            height: targetZeroPoint.y - sourceZeroPoint.y
+        )
+    }
+
+    func performRulerHotkey(
+        keyCode: Int,
+        modifierFlags: NSEvent.ModifierFlags,
+        sender: Any
+    ) -> Bool {
+        let keyboardModifiers = modifierFlags
+            .intersection(.deviceIndependentFlagsMask)
+            .subtracting(.capsLock)
+
+        if keyboardModifiers == .shift {
+            switch keyCode {
+            case kVK_ANSI_H:
+                flipHorizontalRuler(sender)
+            case kVK_ANSI_V:
+                flipVerticalRuler(sender)
+            default:
+                return false
+            }
+
+            return true
+        }
+
+        guard keyboardModifiers.isEmpty else { return false }
+
         switch keyCode {
         case kVK_ANSI_H:
             toggleHorizontalRuler(sender)
@@ -542,6 +663,40 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         showHotkeyBezel(prefs.groupRulers ? .rulersGrouped : .rulersUngrouped, on: screen)
     }
 
+    private func showHorizontalOriginHotkeyBezel(on screen: NSScreen?) {
+        switch prefs.zeroCorner {
+        case .topLeft, .bottomLeft:
+            showHotkeyBezel(
+                format: .horizontalOriginFormat,
+                HotkeyBezelLocalizationKey.originLeft.localizedString,
+                on: screen
+            )
+        case .topRight, .bottomRight:
+            showHotkeyBezel(
+                format: .horizontalOriginFormat,
+                HotkeyBezelLocalizationKey.originRight.localizedString,
+                on: screen
+            )
+        }
+    }
+
+    private func showVerticalOriginHotkeyBezel(on screen: NSScreen?) {
+        switch prefs.zeroCorner {
+        case .topLeft, .topRight:
+            showHotkeyBezel(
+                format: .verticalOriginFormat,
+                HotkeyBezelLocalizationKey.originTop.localizedString,
+                on: screen
+            )
+        case .bottomLeft, .bottomRight:
+            showHotkeyBezel(
+                format: .verticalOriginFormat,
+                HotkeyBezelLocalizationKey.originBottom.localizedString,
+                on: screen
+            )
+        }
+    }
+
     private func bezelScreen(for sender: Any) -> NSScreen? {
         if let rulerController = sender as? RulerController {
             return rulerController.rulerWindow.screen

Free Ruler/Base.lproj/MainMenu.xib

@@ -193,9 +193,15 @@
                                     <items>
                                         <menuItem title="Flip Horizontal" keyEquivalent="h" id="GZl-Zd-Ad4">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES"/>
+                                            <connections>
+                                                <action selector="flipHorizontalRuler:" target="Voe-Tx-rLC" id="VqQ-nA-hUx"/>
+                                            </connections>
                                         </menuItem>
                                         <menuItem title="Flip Vertical" keyEquivalent="v" id="IQD-xF-keq">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES"/>
+                                            <connections>
+                                                <action selector="flipVerticalRuler:" target="Voe-Tx-rLC" id="xUP-Jr-AP0"/>
+                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>

Free Ruler/FreeRuler.help/Contents/Info.plist

@@ -13,19 +13,19 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1</string>
+	<string>2</string>
 	<key>CFBundleSignature</key>
 	<string>hbwr</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>HPDBookAccessPath</key>
 	<string>FreeRuler.html</string>
 	<key>HPDBookIconPath</key>
 	<string></string>
 	<key>HPDBookIndexPath</key>
 	<string>English.lproj.helpindex</string>
 	<key>HPDBookKBProduct</key>
-	<string>freeruler1</string>
+	<string>freeruler2</string>
 	<key>HPDBookTitle</key>
 	<string>Free Ruler Help</string>
 	<key>HPDBookType</key>