Skip to content

Commit 18f32e1

Browse files
committed
fix some final issues
1 parent 4ed670c commit 18f32e1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

ColorControl.UI/Components/Pages/Nvidia/NvidiaDriverSettings.razor

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,10 @@
150150

151151
protected async Task LoadDriverSettings()
152152
{
153-
if (DriverSettings == null)
153+
DriverSettings = await _rpcClientService.CallAsync<List<NvSettingItemDto>>("NvService", "GetDriverSettings", CurrentProfileName);
154+
if (DriverSettings != null)
154155
{
155-
DriverSettings = await _rpcClientService.CallAsync<List<NvSettingItemDto>>("NvService", "GetDriverSettings", CurrentProfileName);
156-
if (DriverSettings != null)
157-
{
158-
DriverSettings.ForEach(s => s.ValueChanged = false);
159-
}
156+
DriverSettings.ForEach(s => s.ValueChanged = false);
160157
}
161158

162159
if (DriverSettings != null)

Shared/Contracts/NVIDIA/NvHdrSettings.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
using System.Text.Json.Serialization;
1+
using System.ComponentModel;
2+
using System.Text.Json.Serialization;
23

34
namespace ColorControl.Shared.Contracts.NVIDIA
45
{
56
public enum NvOutputMode
67
{
78
Default = 0,
9+
[Description("HDR10")]
810
Hdr10 = 1,
11+
[Description("HDR10+")]
912
Hdr10Plus = 2
1013
}
1114

Shared/Contracts/NVIDIA/NvPreset.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void UpdateAutoApplySettings(NvPreset currentSettings = null, bool keepCh
142142

143143
applyColorData = keepChanges && applyColorData || colorData.IsDifferent(currentSettings.colorData);
144144
applyDithering = keepChanges && applyDithering || (ditheringEnabled != currentSettings.ditheringEnabled || ditheringMode != currentSettings.ditheringMode || ditheringBits != currentSettings.ditheringBits);
145-
applyHDR = keepChanges && applyHDR || (HDREnabled != currentSettings.HDREnabled || toggleHDR || SDRBrightness != currentSettings.SDRBrightness);
145+
applyHDR = keepChanges && applyHDR || (HDREnabled != currentSettings.HDREnabled || toggleHDR || SDRBrightness != currentSettings.SDRBrightness || HdrSettings.OutputMode != currentSettings.HdrSettings.OutputMode);
146146
DisplayConfig.ApplyResolution = keepChanges && DisplayConfig.ApplyResolution || (DisplayConfig.Resolution.IsDifferent(currentSettings.DisplayConfig.Resolution) ||
147147
DisplayConfig.Scaling != currentSettings.DisplayConfig.Scaling || DisplayConfig.Rotation != currentSettings.DisplayConfig.Rotation || DisplayConfig.IsPrimary != null && DisplayConfig.IsPrimary != currentSettings.DisplayConfig.IsPrimary);
148148
DisplayConfig.ApplyRefreshRate = keepChanges && DisplayConfig.ApplyRefreshRate || !DisplayConfig.RefreshRate.Equals(currentSettings.DisplayConfig.RefreshRate);

0 commit comments

Comments
 (0)