From c2bce23fc3583750fa1f73aae50819dc8be1849b Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 11 Apr 2022 20:43:51 +0200 Subject: [PATCH] chore: fix old references, Rider didn't bother refactoring the rest --- Dalamud/Interface/Internal/InterfaceManager.cs | 2 +- Dalamud/Interface/Internal/Windows/SettingsWindow.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 67a7027b3..21b5de793 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -213,7 +213,7 @@ namespace Dalamud.Interface.Internal /// /// Gets the font gamma value to use. /// - public float FontGamma => Math.Max(0.1f, this.FontGammaOverride.GetValueOrDefault(Service.Get().FontGamma)); + public float FontGamma => Math.Max(0.1f, this.FontGammaOverride.GetValueOrDefault(Service.Get().FontGammaLevel)); /// /// Gets or sets a value indicating whether to override configuration for FontResolutionLevel. diff --git a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs index 1fc8a4586..4dffd0148 100644 --- a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs +++ b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs @@ -99,7 +99,7 @@ namespace Dalamud.Interface.Internal.Windows this.doMbCollect = configuration.IsMbCollect; this.globalUiScale = configuration.GlobalUiScale; - this.fontGamma = configuration.FontGamma; + this.fontGamma = configuration.FontGammaLevel; this.doUseAxisFontsFromGame = configuration.UseAxisFontsFromGame; this.fontResolutionLevel = configuration.FontResolutionLevel; this.doToggleUiHide = configuration.ToggleUiHide; @@ -197,7 +197,7 @@ namespace Dalamud.Interface.Internal.Windows var configuration = Service.Get(); var interfaceManager = Service.Get(); - var rebuildFont = interfaceManager.FontGamma != configuration.FontGamma; + var rebuildFont = interfaceManager.FontGamma != configuration.FontGammaLevel; ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale; interfaceManager.FontGammaOverride = null; @@ -930,7 +930,7 @@ namespace Dalamud.Interface.Internal.Windows configuration.UseAxisFontsFromGame = this.doUseAxisFontsFromGame; configuration.FontResolutionLevel = this.fontResolutionLevel; - configuration.FontGamma = this.fontGamma; + configuration.FontGammaLevel = this.fontGamma; // This is applied every frame in InterfaceManager::CheckViewportState() configuration.IsDisableViewport = !this.doViewport;