fix: big sur menu bar layout change cause set wrong rating issue

MainasuK · Aug 5, 2020 · 9737a5f · 9737a5f
1 parent 6288cb7
commit 9737a5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 10e6f5005867dbb3964c6d40690aff5abd64540b
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3
diff --git a/Song Rating/Controls/RatingControl.swift b/Song Rating/Controls/RatingControl.swift
@@ -96,8 +96,14 @@ extension RatingControl {
 
         // assert image center aligment without resize and leading & tariling margin added
         let position = sender.convert(event.locationInWindow, to: nil)  //  leading margin | image | trailing margin
-        let systemLeftMargin = 0.5 * (width - imageWidth)               //  leading margin (default 4 on menu bar)
-        let positionX = position.x - systemLeftMargin                   // -leading margin ~ image.size.with
+        let systemLeftMargin: CGFloat = {
+            if #available(macOS 11.0, *) {
+                return 20 + 0.5 * (width - imageWidth)                  //  big sur magic container width + leading margin
+            } else {
+                return 0.5 * (width - imageWidth)                       //  leading margin (default 4)
+            }
+        }()
+        let positionX = position.x - systemLeftMargin                   // x in range: -leading margin ~ image.size.with
 
         var rating: Int?
         let array = Array(0..<5)