Added brightness adjustment step

seerge · Sep 16, 2024 · d0f0bd9 · d0f0bd9
1 parent ef76998
commit d0f0bd9
Showing 1 changed file with 25 additions and 18 deletions.
diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs
@@ -228,24 +228,31 @@ static void CustomKey(string configKey = "m3")
         }
 
 
-        static void SetBrightness(int delta)
+        static void SetBrightness(bool up)
         {
             int brightness = -1;
 
             if (isTUF) brightness = ScreenBrightness.Get();
-            if (AppConfig.SwappedBrightness()) delta = -delta;
+            if (AppConfig.SwappedBrightness()) up = !up;
 
-            Program.acpi.DeviceSet(AsusACPI.UniversalControl, delta > 0 ? AsusACPI.Brightness_Up : AsusACPI.Brightness_Down, "Brightness");
+            int step = AppConfig.Get("brightness_step", 10);
+            if (step != 10)
+            {
+                Program.toast.RunToast(ScreenBrightness.Adjust(up ? step : -step) + "%", up ? ToastIcon.BrightnessUp : ToastIcon.BrightnessDown);
+                return;
+            }
+
+            Program.acpi.DeviceSet(AsusACPI.UniversalControl, up ? AsusACPI.Brightness_Up : AsusACPI.Brightness_Down, "Brightness");
 
             if (isTUF)
             {
                 if (AppConfig.SwappedBrightness()) return;
-                if (delta < 0 && brightness <= 0) return;
-                if (delta > 0 && brightness >= 100) return;
+                if (!up && brightness <= 0) return;
+                if (up && brightness >= 100) return;
 
                 Thread.Sleep(100);
                 if (brightness == ScreenBrightness.Get())
-                    Program.toast.RunToast(ScreenBrightness.Adjust(delta) + "%", (delta < 0) ? ToastIcon.BrightnessDown : ToastIcon.BrightnessUp);
+                    Program.toast.RunToast(ScreenBrightness.Adjust(up ? step : -step) + "%", up ? ToastIcon.BrightnessUp : ToastIcon.BrightnessDown);
             }
 
         }
@@ -294,10 +301,10 @@ public void KeyPressed(object sender, KeyPressedEventArgs e)
                             HandleEvent(199); // Backlight cycle
                             return;
                         case Keys.F5:
-                            SetBrightness(-10);
+                            SetBrightness(false);
                             return;
                         case Keys.F6:
-                            SetBrightness(+10);
+                            SetBrightness(true);
                             return;
                         case Keys.F7:
                             KeyboardHook.KeyKeyPress(Keys.LWin, Keys.P);
@@ -365,10 +372,10 @@ public void KeyPressed(object sender, KeyPressedEventArgs e)
                         KeyboardHook.KeyPress(Keys.Snapshot);
                         break;
                     case Keys.F7:
-                        SetBrightness(-10);
+                        SetBrightness(false);
                         break;
                     case Keys.F8:
-                        SetBrightness(+10);
+                        SetBrightness(true);
                         break;
                     case Keys.F9:
                         KeyboardHook.KeyKeyPress(Keys.LWin, Keys.P);
@@ -417,10 +424,10 @@ public void KeyPressed(object sender, KeyPressedEventArgs e)
                 switch (e.Key)
                 {
                     case Keys.F1:
-                        SetBrightness(-10);
+                        SetBrightness(false);
                         break;
                     case Keys.F2:
-                        SetBrightness(10);
+                        SetBrightness(true);
                         break;
                     case Keys.F3:
                         Program.settingsForm.gpuControl.ToggleXGM(true);
@@ -462,11 +469,11 @@ public void KeyPressed(object sender, KeyPressedEventArgs e)
                 {
                     case Keys.VolumeDown:
                         // Screen brightness down on CTRL+VolDown
-                        SetBrightness(-10);
+                        SetBrightness(false);
                         break;
                     case Keys.VolumeUp:
                         // Screen brightness up on CTRL+VolUp
-                        SetBrightness(+10);
+                        SetBrightness(true);
                         break;
                 }
             }
@@ -563,10 +570,10 @@ public static void KeyProcess(string name = "m3")
                     if (AppConfig.IsVivoZenbook()) Program.acpi.DeviceSet(AsusACPI.MicMuteLed, muteStatus ? 1 : 0, "MicmuteLed");
                     break;
                 case "brightness_up":
-                    SetBrightness(+10);
+                    SetBrightness(true);
                     break;
                 case "brightness_down":
-                    SetBrightness(-10);
+                    SetBrightness(false);
                     break;
                 case "screenpad_up":
                     SetScreenpad(10);
@@ -777,7 +784,7 @@ static void HandleOptimizationEvent(int EventID)
                     }
                     else
                     {
-                        Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Down, "Brightness");
+                        SetBrightness(false);
                     }
                     break;
                 case 32: // FN+F8
@@ -792,7 +799,7 @@ static void HandleOptimizationEvent(int EventID)
                     }
                     else
                     {
-                        Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Up, "Brightness");
+                        SetBrightness(true);
                     }
                     break;
                 case 133: // Camera Toggle