Fix brightness offset

OCJvanDijk · Nov 17, 2019 · 3a9a65b · 3a9a65b
1 parent aaf1724
commit 3a9a65b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Brightness Sync.xcodeproj/project.pbxproj b/Brightness Sync.xcodeproj/project.pbxproj
@@ -283,15 +283,15 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.0.0;
+				CURRENT_PROJECT_VERSION = 2.0.1;
 				DEVELOPMENT_TEAM = 2Z5D432U62;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Brightness Sync/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.vandijk.Brightness-Sync";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -309,15 +309,15 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.0.0;
+				CURRENT_PROJECT_VERSION = 2.0.1;
 				DEVELOPMENT_TEAM = 2Z5D432U62;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Brightness Sync/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				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
@@ -176,10 +176,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             .combineLatest(brightnessOffsetPublisher, targetDisplaysPublisher)
             .sink { brightnessStatus, brightnessOffset, targets in
                 guard case let .Running(brightness) = brightnessStatus else { return }
-                let adjustedBrightness = (brightness + brightnessOffset).clamped(to: 0.0...1.0)
 
                 for target in targets {
-                    CoreDisplay_Display_SetLinearBrightness(target, adjustedBrightness)
+                    CoreDisplay_Display_SetLinearBrightness(target, brightness)
+
+                    if brightnessOffset != 0 {
+                        let newUserBrightness = CoreDisplay_Display_GetUserBrightness(target)
+                        let adjustedUserBrightness = (newUserBrightness + brightnessOffset).clamped(to: 0.0...1.0)
+                        CoreDisplay_Display_SetUserBrightness(target, adjustedUserBrightness)
+                    }
                 }
             }
             .store(in: &cancelBag)