diff --git a/app/AppConfig.cs b/app/AppConfig.cs index 03af8cf4..f785ceed 100644 --- a/app/AppConfig.cs +++ b/app/AppConfig.cs @@ -411,7 +411,7 @@ public static class AppConfig public static bool IsOLED() { - return ContainsModel("OLED") || IsSlash() || ContainsModel("M7600") || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150") || ContainsModel("M350") || ContainsModel("K650") || ContainsModel("UM53") || ContainsModel("K660") || ContainsModel("UX84") || ContainsModel("M650") || ContainsModel("K340") || ContainsModel("K350") || ContainsModel("M140"); + return ContainsModel("OLED") || IsSlash() || ContainsModel("M7600") || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150") || ContainsModel("M350") || ContainsModel("K650") || ContainsModel("UM53") || ContainsModel("K660") || ContainsModel("UX84") || ContainsModel("M650") || ContainsModel("K340") || ContainsModel("K350") || ContainsModel("M140") || ContainsModel("UM340"); } public static bool IsNoOverdrive() diff --git a/app/Display/VisualControl.cs b/app/Display/VisualControl.cs index a6f7b955..93947297 100644 --- a/app/Display/VisualControl.cs +++ b/app/Display/VisualControl.cs @@ -66,6 +66,11 @@ namespace GHelper.Display return Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\ASUS\\ASUS System Control Interface\\ASUSOptimization\\Splendid"; } + public static SplendidGamut GetDefaultGamut() + { + return AppConfig.IsVivoZenbook() ? SplendidGamut.VivoNative : SplendidGamut.Native; + } + public static Dictionary GetGamutModes() { @@ -104,6 +109,11 @@ namespace GHelper.Display } + public static SplendidCommand GetDefaultVisualMode() + { + return AppConfig.IsVivoZenbook() ? SplendidCommand.VivoNormal : SplendidCommand.Default; + } + public static Dictionary GetVisualModes() { diff --git a/app/Settings.cs b/app/Settings.cs index d09bcc8b..0e442ad5 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -323,7 +323,7 @@ namespace GHelper panelGamma.Visible = true; tableVisual.Visible = true; - var visualValue = (SplendidCommand)AppConfig.Get("visual", (int)SplendidCommand.Default); + var visualValue = (SplendidCommand)AppConfig.Get("visual", (int)VisualControl.GetDefaultVisualMode()); var colorTempValue = AppConfig.Get("color_temp", VisualControl.DefaultColorTemp); comboVisual.DropDownStyle = ComboBoxStyle.DropDownList; @@ -352,7 +352,7 @@ namespace GHelper comboGamut.DataSource = new BindingSource(gamuts, null); comboGamut.DisplayMember = "Value"; comboGamut.ValueMember = "Key"; - comboGamut.SelectedValue = (SplendidGamut)AppConfig.Get("gamut", (int)SplendidGamut.Native); + comboGamut.SelectedValue = (SplendidGamut)AppConfig.Get("gamut", (int)VisualControl.GetDefaultGamut()); comboGamut.SelectedValueChanged += ComboGamut_SelectedValueChanged; comboGamut.Visible = true;