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

Visual Mode tweaks

Browse Source
This commit is contained in:
Serge
2024-09-18 09:45:01 +02:00
parent 6758d9224d
commit 07f1edb02f
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Display/VisualControl.cs
View File

@@ -211,9 +211,14 @@ namespace GHelper.Display
AppConfig.Set("gamut", mode); AppConfig.Set("gamut", mode);
if (RunSplendid(SplendidCommand.GamutMode, 0, mode)) return; var result = RunSplendid(SplendidCommand.GamutMode, 0, mode);
if (result == 0) return;
if (_init) if (result == -1)
{
Logger.WriteLine("Gamut setting refused, reverting.");
RunSplendid(SplendidCommand.GamutMode, 0, (int)GetDefaultGamut());
}
if (result == 1 && _init)
{ {
_init = false; _init = false;
RunSplendid(SplendidCommand.Init); RunSplendid(SplendidCommand.Init);
@@ -253,9 +258,14 @@ namespace GHelper.Display
break; break;
} }
if (RunSplendid(mode, 0, balance)) return; var result = RunSplendid(mode, 0, balance);
if (result == 0) return;
if (_init) if (result == -1)
{
Logger.WriteLine("Visual setting refused, reverting.");
RunSplendid(SplendidCommand.Default, 0, DefaultColorTemp);
}
if (result == 1 && _init)
{ {
_init = false; _init = false;
RunSplendid(SplendidCommand.Init); RunSplendid(SplendidCommand.Init);
@@ -288,7 +298,7 @@ namespace GHelper.Display
return _splendidPath; return _splendidPath;
} }
private static bool RunSplendid(SplendidCommand command, int? param1 = null, int? param2 = null) private static int RunSplendid(SplendidCommand command, int? param1 = null, int? param2 = null)
{ {
var splendid = GetSplendidPath(); var splendid = GetSplendidPath();
bool isVivo = AppConfig.IsVivoZenPro(); bool isVivo = AppConfig.IsVivoZenPro();
@@ -298,10 +308,11 @@ namespace GHelper.Display
{ {
if (command == SplendidCommand.DimmingVisual && isVivo) command = SplendidCommand.DimmingVivo; if (command == SplendidCommand.DimmingVisual && isVivo) command = SplendidCommand.DimmingVivo;
var result = ProcessHelper.RunCMD(splendid, (int)command + " " + param1 + " " + param2); var result = ProcessHelper.RunCMD(splendid, (int)command + " " + param1 + " " + param2);
if (result.Contains("file not exist") || (result.Length == 0 && !isVivo)) return false; if (result.Contains("file not exist") || (result.Length == 0 && !isVivo)) return 1;
if (result.Contains("return code: -1")) return -1;
} }
return true; return 0;
} }
private static void BrightnessTimerTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e) private static void BrightnessTimerTimer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
@@ -309,14 +320,14 @@ namespace GHelper.Display
brightnessTimer.Stop(); brightnessTimer.Stop();
if (RunSplendid(SplendidCommand.DimmingVisual, 0, (int)(40 + _brightness * 0.6))) return; if (RunSplendid(SplendidCommand.DimmingVisual, 0, (int)(40 + _brightness * 0.6)) == 0) return;
if (_init) if (_init)
{ {
_init = false; _init = false;
RunSplendid(SplendidCommand.Init); RunSplendid(SplendidCommand.Init);
RunSplendid(SplendidCommand.Init, 4); RunSplendid(SplendidCommand.Init, 4);
if (RunSplendid(SplendidCommand.DimmingVisual, 0, (int)(40 + _brightness * 0.6))) return; if (RunSplendid(SplendidCommand.DimmingVisual, 0, (int)(40 + _brightness * 0.6)) == 0) return;
} }
// GammaRamp Fallback // GammaRamp Fallback