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

Merge branch 'main' into cpu-auto-tdp

Browse Source 
# Conflicts:
#	app/Settings.cs
This commit is contained in:
IceStormNG
2024-03-01 23:59:55 +01:00
parent c31e52bc74 599def92b3
commit 181a16bee3
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Display/ScreenControl.cs
View File

@@ -47,6 +47,17 @@ namespace GHelper.Display
} }
} }
public void SetBrightness(int brightness = -1)
{
if (!AppConfig.IsOLED()) return;
if (brightness >= 0) AppConfig.Set("brightness", brightness);
else brightness = AppConfig.Get("brightness");
if (brightness >= 0) SetGamma(brightness);
}
public void SetGamma(int brightness = 100) public void SetGamma(int brightness = 100)
{ {
var bright = Math.Round((float)brightness / 200 + 0.5, 2); var bright = Math.Round((float)brightness / 200 + 0.5, 2);

2
app/Fan/FanSensorControl.cs
View File

@@ -9,7 +9,7 @@ namespace GHelper.Fan
public const int XGM_FAN_MAX = 72; public const int XGM_FAN_MAX = 72;
public const int INADEQUATE_MAX = 92; public const int INADEQUATE_MAX = 104;
const int FAN_COUNT = 3; const int FAN_COUNT = 3;

2
app/Helpers/ClamshellModeControl.cs
View File

@@ -101,6 +101,8 @@ namespace GHelper.Helpers
if (Program.settingsForm.Visible) if (Program.settingsForm.Visible)
Program.screenControl.InitScreen(); Program.screenControl.InitScreen();
Program.screenControl.SetBrightness();
} }
private static int CheckAndSaveLidAction() private static int CheckAndSaveLidAction()

22
app/Settings.cs
View File

@@ -258,13 +258,25 @@ namespace GHelper
VisualiseFnLock(); VisualiseFnLock();
buttonFnLock.Click += ButtonFnLock_Click; buttonFnLock.Click += ButtonFnLock_Click;
panelGamma.Visible = AppConfig.IsOLED();
sliderGamma.ValueChanged += SliderGamma_ValueChanged;
labelGamma.Text = "100%";
panelPerformance.Focus(); panelPerformance.Focus();
InitBrightness();
} }
public void InitBrightness()
{
if (!AppConfig.IsOLED()) return;
panelGamma.Visible = true;
int brightness = AppConfig.Get("brightness");
if (brightness >= 0) sliderGamma.Value = brightness;
sliderGamma.ValueChanged += SliderGamma_ValueChanged;
labelGamma.Text = sliderGamma.Value + "%";
}
private void ButtonAutoTDP_Click(object? sender, EventArgs e) private void ButtonAutoTDP_Click(object? sender, EventArgs e)
{ {
autoTdpUi = new AutoTDPUI(); autoTdpUi = new AutoTDPUI();
@@ -293,7 +305,7 @@ namespace GHelper
private void SliderGamma_ValueChanged(object? sender, EventArgs e) private void SliderGamma_ValueChanged(object? sender, EventArgs e)
{ {
screenControl.SetGamma(sliderGamma.Value); screenControl.SetBrightness(sliderGamma.Value);
labelGamma.Text = sliderGamma.Value + "%"; labelGamma.Text = sliderGamma.Value + "%";
} }