Accommodate updated System Preferences window size.

cormiertyshawn895 · cormiertyshawn895 · commit 35b78a590dc4 · 2020-09-05T15:57:22.000-07:00
diff --git a/Retroactive.xcodeproj/project.pbxproj b/Retroactive.xcodeproj/project.pbxproj
@@ -980,7 +980,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 75;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1001,7 +1001,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 75;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/Retroactive/Common/Extensions/CGType-Extension.swift b/Retroactive/Common/Extensions/CGType-Extension.swift
@@ -4,4 +4,21 @@ extension CGSize {
     func similarToSize(_ size: CGSize, maxDeltaX: CGFloat = 8, maxDeltaY: CGFloat = 8) -> Bool {
         return abs(self.width - size.width) <= maxDeltaX && abs(self.height - size.height) <= maxDeltaY
     }
+    
+    var similarToSecurityPrefPaneSize: Bool {
+        // Security preferences window is around 668x573 on Catalina, 668x587 on Big Sur
+        return self.similarToSize(CGSize(width: 668, height: osAtLeastBigSur ? 587 : 573), maxDeltaX: 180, maxDeltaY: 5)
+    }
+    
+    var similarToPasswordDialogSize: Bool {
+        return self.similarToSize(CGSize(width: 444, height: 212), maxDeltaX: 40, maxDeltaY: 212)
+    }
+    
+    var similarToDimmingBackgroundSize: Bool {
+        if (!osAtLeastBigSur) {
+            return false
+        }
+        // Dimming background is around 668x535 on Big Sur
+        return self.similarToSize(CGSize(width: 668, height: 535), maxDeltaX: 180, maxDeltaY: 5)
+    }
 }
diff --git a/Retroactive/StepFour/SyncingViewController.swift b/Retroactive/StepFour/SyncingViewController.swift
@@ -58,15 +58,15 @@ class SyncingViewController: NSViewController, GuaranteeViewControllerDelegate,
     func populateGuarantees() {
         let guarantees: [GuaranteeSection] = [
             GuaranteeSection(title: "Why does iPod syncing need Full Disk Access?".localized(),
-                             explaination: "iPod devices are considered as removable storage by macOS Catalina. iTunes needs Full Disk Access to access removable storage and shared network drives.".localized(),
+                             explaination: String(format: "iPod devices are considered as removable storage by %@. iTunes needs Full Disk Access to access removable storage and shared network drives.".localized(), ProcessInfo.versionName),
                              buttonText: nil,
                              buttonAction: nil),
             GuaranteeSection(title: "Can I use iTunes without Full Disk Access?".localized(),
                              explaination: "Yes, you can. However, iTunes will not sync with iPod devices, play music on removable storage, or access shared iTunes libraries on a network drive.".localized(),
                              buttonText: "Use iTunes without Full Disk Access".localized() + disclosureArrow,
                              buttonAction: { self.skipSyncingClicked(self) }),
             GuaranteeSection(title: "Why isn’t this more granular?".localized(),
-                             explaination: "While apps optimized for macOS Catalina can request granular access to Removable Volumes, iTunes was built before macOS Catalina. Retroactive’s loader script has similar requirements.".localized(),
+                             explaination: String(format: "While apps optimized for %@ can request granular access to Removable Volumes, iTunes was built before %@. Retroactive’s loader script has similar requirements.".localized(), ProcessInfo.versionName, ProcessInfo.versionName),
                              buttonText: nil,
                              buttonAction: nil)
         ]
@@ -143,12 +143,16 @@ class SyncingViewController: NSViewController, GuaranteeViewControllerDelegate,
                 lastOrigin = CGPoint(x: windowX, y: windowY)
                 lastWidthHeight = CGSize(width: windowWidth, height: windowHeight)
             }
+            if (lastWidthHeight.similarToPasswordDialogSize) {
+                // On Big Sur, there's two extra windows for dimmed sheet presentations.
+                // Ignore them once a sheet window is found.
+                break
+            }
         }
         
         let screen = NSScreen.screens.first!
         let yPositionInScreenSpace = screen.frame.size.height - lastOrigin.y - lastWidthHeight.height
-        if (lastWidthHeight.similarToSize(CGSize(width: 668, height: 573), maxDeltaX: 180, maxDeltaY: 5)) {
-            // Security preferences window is around 668x573
+        if (lastWidthHeight.similarToSecurityPrefPaneSize) {
             if (shouldShowDragBashView) {
                 padlockWindow.orderOut(self)
                 // to drag window
@@ -167,20 +171,22 @@ class SyncingViewController: NSViewController, GuaranteeViewControllerDelegate,
                                                       y: yPositionInScreenSpace - padlockWindow.frame.height + 25))
             }
             mostRecentPrefsFrame = CGRect(x: lastOrigin.x, y: lastOrigin.y, width: lastWidthHeight.width, height: lastWidthHeight.height)
-        } else if (lastWidthHeight.similarToSize(CGSize(width: 444, height: 212), maxDeltaX: 40, maxDeltaY: 212)) {
+        } else if (lastWidthHeight.similarToPasswordDialogSize) {
             // Password entry
             shouldShowDragBashView = true
             padlockWindow.orderOut(self)
             dragWindow.orderOut(self)
             upArrowWindow.orderOut(self)
         } else {
             // Main preferences window is around 668x586
-            shouldShowDragBashView = false
             padlockWindow.orderOut(self)
             dragWindow.orderOut(self)
             upArrowWindow.orderOut(self)
-            self.view.window?.deminiaturize(self)
-            self.view.window?.makeKeyAndOrderFront(self)
+            if (!lastWidthHeight.similarToDimmingBackgroundSize) {
+                shouldShowDragBashView = false
+                self.view.window?.deminiaturize(self)
+                self.view.window?.makeKeyAndOrderFront(self)
+            }
         }
     }
     
diff --git a/Retroactive/Support/SupportPath.plist b/Retroactive/Support/SupportPath.plist
@@ -3,27 +3,27 @@
 <plist version="1.0">
 <dict>
 	<key>NewVersionVisibleTitle</key>
-    <string>Retroactive 1.8 (Build 74) adds new features and improves compatibility.</string>
+    <string>Retroactive 1.8 (Build 75) adds new features and improves compatibility.</string>
 	<key>NewVersionChangelog</key>
     <string>• Adds support for unlocking Xcode 11.7 on macOS Mojave
 • Adds experimental support for unlocking Aperture and iTunes on macOS Big Sur
 </string>
 	<key>NewVersionVisibleTitlezhHans</key>
-	<string>新版本解印 1.8 (版本号 74) 包含新功能，并改进了兼容性</string>
+	<string>新版本解印 1.8 (版本号 75) 包含新功能，并改进了兼容性</string>
 	<key>NewVersionChangelogzhHans</key>
     <string>• 新增支持在 macOS Mojave 下解锁 Xcode 11.7
 • 新增实验性支持在 macOS Big Sur 下解锁 Aperture 和 iTunes
 </string>
 	<key>NewVersionVisibleTitlezhHant</key>
-	<string>新版本解印 1.8 (版本號 74) 包含新功能，並改進了兼容性</string>
+	<string>新版本解印 1.8 (版本號 75) 包含新功能，並改進了兼容性</string>
 	<key>NewVersionChangelogzhHant</key>
     <string>• 新增支持在 macOS Mojave 下解鎖 Xcode 11.7
 • 新增實驗性支持在 macOS Big Sur 下解鎖 Aperture 和 iTunes
 </string>
 	<key>LatestZIP</key>
 	<string>https://github.com/cormiertyshawn895/Retroactive/releases/download/1.8/Retroactive.1.8.zip</string>
 	<key>LatestBuildNumber</key>
-	<integer>74</integer>
+	<integer>75</integer>
 	<key>SupportPathURL</key>
 	<string>https://raw.githubusercontent.com/cormiertyshawn895/Retroactive/master/Retroactive/Support/SupportPath.plist</string>
 	<key>ReleasePage</key>
diff --git a/Retroactive/Support/zh-Hans.lproj/Localizable.strings b/Retroactive/Support/zh-Hans.lproj/Localizable.strings
@@ -138,7 +138,7 @@
 "View Release Page..." = "查看下载发布页..."; 
 "Waiting..." = "等待中..."; 
 "We recommend updating %@ to version %@." = "解印推荐您将 %@ 更新至 %@ 版本"; 
-"While apps optimized for macOS Catalina can request granular access to Removable Volumes, iTunes was built before macOS Catalina. Retroactive’s loader script has similar requirements." = "尽管为 macOS Catalina 优化的应用程序可以选择只允许访问可移除的宗卷，iTunes 为 macOS Catalina 之前的系统构建。解印的加载脚本也有类似的要求。"; 
+"While apps optimized for %@ can request granular access to Removable Volumes, iTunes was built before %@. Retroactive’s loader script has similar requirements." = "尽管为 %@ 优化的应用程序可以选择只允许访问可移除的宗卷，iTunes 为 %@ 之前的系统构建。解印的加载脚本也有类似的要求。"; 
 "Why does iPod syncing need Full Disk Access?" = "为什么与 iPod 同步需要完全磁盘访问权限？"; 
 "Why isn’t this more granular?" = "为什么不能选择更加细化的访问权限？"; 
 "Working..." = "进行中..."; 
@@ -165,7 +165,7 @@
 "downloading and installing" = "下载和安装"; 
 "fix" = "修复"; 
 "iPhoto has reduced functionality" = "iPhoto 功能受限"; 
-"iPod devices are considered as removable storage by macOS Catalina. iTunes needs Full Disk Access to access removable storage and shared network drives." = "macOS 将 iPod 设备认定为可移除的宗卷。iTunes 需要完全磁盘访问权限才能访问可移除宗卷和共享的网络服务器。"; 
+"iPod devices are considered as removable storage by %@. iTunes needs Full Disk Access to access removable storage and shared network drives." = "%@ 将 iPod 设备认定为可移除的宗卷。iTunes 需要完全磁盘访问权限才能访问可移除宗卷和共享的网络服务器。"; 
 "install" = "安装"; 
 "installing support files for" = "安装组件以支持"; 
 "unlock" = "解锁"; 
diff --git a/Retroactive/Support/zh-Hant.lproj/Localizable.strings b/Retroactive/Support/zh-Hant.lproj/Localizable.strings
@@ -138,7 +138,7 @@
 "View Release Page..." = "查看下載發布頁..."; 
 "Waiting..." = "等待中..."; 
 "We recommend updating %@ to version %@." = "解印推薦您將 %@ 更新至 %@ 版本"; 
-"While apps optimized for macOS Catalina can request granular access to Removable Volumes, iTunes was built before macOS Catalina. Retroactive’s loader script has similar requirements." = "儘管為 macOS Catalina 優化的應用程序可以選擇只允許訪問可移除的宗卷，iTunes 為 macOS Catalina 之前的系統構建。解印的加載腳本也有類似的要求。"; 
+"While apps optimized for %@ can request granular access to Removable Volumes, iTunes was built before %@. Retroactive’s loader script has similar requirements." = "盡管為 %@ 優化的應用程序可以選擇隻允許訪問可移除的宗卷，iTunes 為 %@ 之前的係統構建。解印的加載腳本也有類似的要求。"; 
 "Why does iPod syncing need Full Disk Access?" = "為什麼與 iPod 同步需要完全取用瓷碟？"; 
 "Why isn’t this more granular?" = "為什麼不能選擇更加細化的訪問權限？"; 
 "Working..." = "進行中..."; 
@@ -165,7 +165,7 @@
 "downloading and installing" = "下載和安裝"; 
 "fix" = "修復"; 
 "iPhoto has reduced functionality" = "iPhoto 功能受限"; 
-"iPod devices are considered as removable storage by macOS Catalina. iTunes needs Full Disk Access to access removable storage and shared network drives." = "macOS 將 iPod 設備認定為可移除的宗卷。iTunes 需要完全取用瓷碟才能訪問可移除宗捲和共享的網絡服務器。"; 
+"iPod devices are considered as removable storage by %@. iTunes needs Full Disk Access to access removable storage and shared network drives." = "%@ 將 iPod 設備認定為可移除的宗卷。iTunes 需要完全磁盤訪問權限才能訪問可移除宗卷和共享的網絡服務器。"; 
 "install" = "安裝"; 
 "installing support files for" = "安裝組件以支持"; 
 "unlock" = "解鎖"; 
