jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backlight fixes

Browse Source
This commit is contained in:
Serge
2023-06-02 13:37:43 +02:00
parent 846cc6e867
commit 65b4192393
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Extra.Designer.cs generated
View File

@@ -326,7 +326,7 @@ namespace GHelper
pictureHelp.BackgroundImage = Resources.icons8_help_64; pictureHelp.BackgroundImage = Resources.icons8_help_64;
pictureHelp.BackgroundImageLayout = ImageLayout.Zoom; pictureHelp.BackgroundImageLayout = ImageLayout.Zoom;
pictureHelp.Cursor = Cursors.Hand; pictureHelp.Cursor = Cursors.Hand;
pictureHelp.Location = new Point(906, 51); pictureHelp.Location = new Point(912, 51);
pictureHelp.Name = "pictureHelp"; pictureHelp.Name = "pictureHelp";
pictureHelp.Size = new Size(32, 32); pictureHelp.Size = new Size(32, 32);
pictureHelp.TabIndex = 9; pictureHelp.TabIndex = 9;

8
app/Extra.cs
View File

@@ -207,10 +207,7 @@ namespace GHelper
checkAutoApplyWindowsPowerMode.Checked = (AppConfig.getConfig("auto_apply_power_plan") != 0); checkAutoApplyWindowsPowerMode.Checked = (AppConfig.getConfig("auto_apply_power_plan") != 0);
checkAutoApplyWindowsPowerMode.CheckedChanged += checkAutoApplyWindowsPowerMode_CheckedChanged; checkAutoApplyWindowsPowerMode.CheckedChanged += checkAutoApplyWindowsPowerMode_CheckedChanged;
int kb_brightness = AppConfig.getConfig("keyboard_brightness"); trackBrightness.Value = InputDispatcher.GetBacklight();
trackBrightness.Value = (kb_brightness >= 0 && kb_brightness <= 3) ? kb_brightness : 3;
pictureHelp.Click += PictureHelp_Click;
trackBrightness.Scroll += TrackBrightness_Scroll; trackBrightness.Scroll += TrackBrightness_Scroll;
panelXMG.Visible = (Program.acpi.DeviceGet(AsusACPI.GPUXGConnected) == 1); panelXMG.Visible = (Program.acpi.DeviceGet(AsusACPI.GPUXGConnected) == 1);
@@ -228,6 +225,8 @@ namespace GHelper
checkFnLock.Checked = AppConfig.isConfig("fn_lock"); checkFnLock.Checked = AppConfig.isConfig("fn_lock");
checkFnLock.CheckedChanged += CheckFnLock_CheckedChanged; ; checkFnLock.CheckedChanged += CheckFnLock_CheckedChanged; ;
pictureHelp.Click += PictureHelp_Click;
} }
private void CheckFnLock_CheckedChanged(object? sender, EventArgs e) private void CheckFnLock_CheckedChanged(object? sender, EventArgs e)
@@ -265,6 +264,7 @@ namespace GHelper
private void TrackBrightness_Scroll(object? sender, EventArgs e) private void TrackBrightness_Scroll(object? sender, EventArgs e)
{ {
AppConfig.setConfig("keyboard_brightness", trackBrightness.Value); AppConfig.setConfig("keyboard_brightness", trackBrightness.Value);
AppConfig.setConfig("keyboard_brightness_ac", trackBrightness.Value);
AsusUSB.ApplyBrightness(trackBrightness.Value, "Slider"); AsusUSB.ApplyBrightness(trackBrightness.Value, "Slider");
} }

18
app/InputDispatcher.cs
View File

@@ -101,7 +101,7 @@ namespace GHelper
if (!backlightActivity && iddle.TotalSeconds < kb_timeout) if (!backlightActivity && iddle.TotalSeconds < kb_timeout)
{ {
backlightActivity = true; backlightActivity = true;
SetBacklightAuto(); SetBacklight();
} }
//Debug.WriteLine(iddle.TotalSeconds); //Debug.WriteLine(iddle.TotalSeconds);
@@ -412,18 +412,26 @@ namespace GHelper
} }
static int GetBacklight() public static int GetBacklight(bool auto = false)
{ {
int backlight_power = AppConfig.getConfig("keyboard_brightness", 1); int backlight_power = AppConfig.getConfig("keyboard_brightness", 1);
int backlight_battery = AppConfig.getConfig("keyboard_brightness_ac", 1); int backlight_battery = AppConfig.getConfig("keyboard_brightness_ac", 1);
bool onBattery = SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online; bool onBattery = SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online;
return onBattery ? Math.Min(backlight_battery, backlight_power) : Math.Max(backlight_battery, backlight_power); int backlight;
if (auto)
backlight = onBattery ? Math.Min(backlight_battery, backlight_power) : Math.Max(backlight_battery, backlight_power);
else
backlight = onBattery ? backlight_battery : backlight_power;
return Math.Max(Math.Min(3, backlight), 0);
} }
public static void SetBacklightAuto() public static void SetBacklight(bool auto = false)
{ {
AsusUSB.ApplyBrightness(GetBacklight(), "Auto"); if (auto) AsusUSB.Init();
AsusUSB.ApplyBrightness(GetBacklight(auto), "Auto");
} }
public static void SetBacklight(int delta) public static void SetBacklight(int delta)

3
app/Settings.cs
View File

@@ -1295,8 +1295,7 @@ namespace GHelper
public void AutoKeyboard() public void AutoKeyboard()
{ {
AsusUSB.Init(); InputDispatcher.SetBacklight(true);
InputDispatcher.SetBacklightAuto();
} }
public void AutoPerformance() public void AutoPerformance()