Support 4k 2nd gen as source. Sync to 2nd gen displays again.

OCJvanDijk · Sep 7, 2020 · cff4b6d · cff4b6d
1 parent 4add94f
commit cff4b6d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/Brightness Sync.xcodeproj/project.pbxproj b/Brightness Sync.xcodeproj/project.pbxproj
@@ -362,15 +362,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "2.3.0-beta.1";
+				CURRENT_PROJECT_VERSION = "2.3.0-beta.2";
 				DEVELOPMENT_TEAM = 7M6D294GQ9;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Brightness Sync/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "2.3.0-beta.1";
+				MARKETING_VERSION = "2.3.0-beta.2";
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.vandijk.Brightness-Sync";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -388,15 +388,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "2.3.0-beta.1";
+				CURRENT_PROJECT_VERSION = "2.3.0-beta.2";
 				DEVELOPMENT_TEAM = 7M6D294GQ9;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Brightness Sync/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "2.3.0-beta.1";
+				MARKETING_VERSION = "2.3.0-beta.2";
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.vandijk.Brightness-Sync";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Brightness Sync/AppDelegate.swift b/Brightness Sync/AppDelegate.swift
@@ -271,17 +271,27 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let isOnConsole = (CGSessionCopyCurrentDictionary() as NSDictionary?)?[kCGSessionOnConsoleKey] as? Bool ?? false
 
         if isOnConsole {
-            let lgVendorNumber = 7789
-//            let ultraFine5k1stGenModelNumber = 23313
-            let ultraFine5k2ndGenModelNumber = 23412
+            let lgVendorNumber: UInt32 = 7789
+//            let ultraFine5k1stGenModelNumber: UInt32 = 23313
+            let ultraFine4k2ndGenModelNumber: UInt32 = 23419
+            let ultraFine5k2ndGenModelNumber: UInt32 = 23412
+
+            func is2ndGenUltraFine(_ display: CGDirectDisplayID) -> Bool {
+                switch (CGDisplayVendorNumber(display), CGDisplayModelNumber(display)) {
+                case (lgVendorNumber, ultraFine4k2ndGenModelNumber), (lgVendorNumber, ultraFine5k2ndGenModelNumber):
+                    return true
+                default:
+                    return false
+                }
+            }
 
             let builtin = activeDisplays
                 .filter { CGDisplayIsBuiltin($0) == 1 }
                 .compactMap { CGDisplayCreateUUIDFromDisplayID($0)?.takeRetainedValue() }
                 .first
 
             let source = builtin ?? activeDisplays
-                .filter { CGDisplayVendorNumber($0) == lgVendorNumber && CGDisplayModelNumber($0) == ultraFine5k2ndGenModelNumber }
+                .filter { is2ndGenUltraFine($0) }
                 .compactMap { CGDisplayCreateUUIDFromDisplayID($0)?.takeRetainedValue() }
                 .first
 
@@ -312,8 +322,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                         return false
                     }
                 }
-                .filter { CGDisplayModelNumber($0) != ultraFine5k2ndGenModelNumber }
                 .compactMap { CGDisplayCreateUUIDFromDisplayID($0)?.takeRetainedValue() }
+                .filter { $0 != source }
 
             displaysPublisher.send((source, targets))
         } else {