Added brightness adjustment step

This commit is contained in:
Serge
2024-09-16 17:21:22 +02:00
parent ef769982e0
commit d0f0bd9155

View File

@@ -228,24 +228,31 @@ namespace GHelper.Input
} }
static void SetBrightness(int delta) static void SetBrightness(bool up)
{ {
int brightness = -1; int brightness = -1;
if (isTUF) brightness = ScreenBrightness.Get(); 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 (isTUF)
{ {
if (AppConfig.SwappedBrightness()) return; if (AppConfig.SwappedBrightness()) return;
if (delta < 0 && brightness <= 0) return; if (!up && brightness <= 0) return;
if (delta > 0 && brightness >= 100) return; if (up && brightness >= 100) return;
Thread.Sleep(100); Thread.Sleep(100);
if (brightness == ScreenBrightness.Get()) 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 @@ namespace GHelper.Input
HandleEvent(199); // Backlight cycle HandleEvent(199); // Backlight cycle
return; return;
case Keys.F5: case Keys.F5:
SetBrightness(-10); SetBrightness(false);
return; return;
case Keys.F6: case Keys.F6:
SetBrightness(+10); SetBrightness(true);
return; return;
case Keys.F7: case Keys.F7:
KeyboardHook.KeyKeyPress(Keys.LWin, Keys.P); KeyboardHook.KeyKeyPress(Keys.LWin, Keys.P);
@@ -365,10 +372,10 @@ namespace GHelper.Input
KeyboardHook.KeyPress(Keys.Snapshot); KeyboardHook.KeyPress(Keys.Snapshot);
break; break;
case Keys.F7: case Keys.F7:
SetBrightness(-10); SetBrightness(false);
break; break;
case Keys.F8: case Keys.F8:
SetBrightness(+10); SetBrightness(true);
break; break;
case Keys.F9: case Keys.F9:
KeyboardHook.KeyKeyPress(Keys.LWin, Keys.P); KeyboardHook.KeyKeyPress(Keys.LWin, Keys.P);
@@ -417,10 +424,10 @@ namespace GHelper.Input
switch (e.Key) switch (e.Key)
{ {
case Keys.F1: case Keys.F1:
SetBrightness(-10); SetBrightness(false);
break; break;
case Keys.F2: case Keys.F2:
SetBrightness(10); SetBrightness(true);
break; break;
case Keys.F3: case Keys.F3:
Program.settingsForm.gpuControl.ToggleXGM(true); Program.settingsForm.gpuControl.ToggleXGM(true);
@@ -462,11 +469,11 @@ namespace GHelper.Input
{ {
case Keys.VolumeDown: case Keys.VolumeDown:
// Screen brightness down on CTRL+VolDown // Screen brightness down on CTRL+VolDown
SetBrightness(-10); SetBrightness(false);
break; break;
case Keys.VolumeUp: case Keys.VolumeUp:
// Screen brightness up on CTRL+VolUp // Screen brightness up on CTRL+VolUp
SetBrightness(+10); SetBrightness(true);
break; break;
} }
} }
@@ -563,10 +570,10 @@ namespace GHelper.Input
if (AppConfig.IsVivoZenbook()) Program.acpi.DeviceSet(AsusACPI.MicMuteLed, muteStatus ? 1 : 0, "MicmuteLed"); if (AppConfig.IsVivoZenbook()) Program.acpi.DeviceSet(AsusACPI.MicMuteLed, muteStatus ? 1 : 0, "MicmuteLed");
break; break;
case "brightness_up": case "brightness_up":
SetBrightness(+10); SetBrightness(true);
break; break;
case "brightness_down": case "brightness_down":
SetBrightness(-10); SetBrightness(false);
break; break;
case "screenpad_up": case "screenpad_up":
SetScreenpad(10); SetScreenpad(10);
@@ -777,7 +784,7 @@ namespace GHelper.Input
} }
else else
{ {
Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Down, "Brightness"); SetBrightness(false);
} }
break; break;
case 32: // FN+F8 case 32: // FN+F8
@@ -792,7 +799,7 @@ namespace GHelper.Input
} }
else else
{ {
Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Up, "Brightness"); SetBrightness(true);
} }
break; break;
case 133: // Camera Toggle case 133: // Camera Toggle