ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-29 20:03:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'net5'

Browse source
This commit is contained in:
goaaats 2022-04-11 21:17:08 +02:00
commit 9a2e2f1024
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/main.yml vendored
View file

@ -86,6 +86,7 @@ jobs:
echo "DVER=${newVersion}" >> $Env:GITHUB_ENV echo "DVER=${newVersion}" >> $Env:GITHUB_ENV
} else { } else {
Write-Host "Deployment folder doesn't exist. Not doing anything." Write-Host "Deployment folder doesn't exist. Not doing anything."
Remove-Item .\canary.zip
} }
- name: Commit changes - name: Commit changes

2
Dalamud/Configuration/Internal/DalamudConfiguration.cs
View file

@ -141,7 +141,7 @@ namespace Dalamud.Configuration.Internal
/// * ...TTF fonts loaded with stb or FreeType are in linear space. /// * ...TTF fonts loaded with stb or FreeType are in linear space.
/// * ...the game's prebaked AXIS fonts are in gamma space with gamma value of 1.4. /// * ...the game's prebaked AXIS fonts are in gamma space with gamma value of 1.4.
/// </summary> /// </summary>
public float FontGamma { get; set; } = 1.4f; public float FontGammaLevel { get; set; } = 1.4f;
/// <summary> /// <summary>
/// Gets or sets a value indicating the level of font resolution between 1 to 5. /// Gets or sets a value indicating the level of font resolution between 1 to 5.

2
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -213,7 +213,7 @@ namespace Dalamud.Interface.Internal
/// <summary> /// <summary>
/// Gets the font gamma value to use. /// Gets the font gamma value to use.
/// </summary> /// </summary>
public float FontGamma => Math.Max(0.1f, this.FontGammaOverride.GetValueOrDefault(Service<DalamudConfiguration>.Get().FontGamma)); public float FontGamma => Math.Max(0.1f, this.FontGammaOverride.GetValueOrDefault(Service<DalamudConfiguration>.Get().FontGammaLevel));
/// <summary> /// <summary>
/// Gets or sets a value indicating whether to override configuration for FontResolutionLevel. /// Gets or sets a value indicating whether to override configuration for FontResolutionLevel.

6
Dalamud/Interface/Internal/Windows/SettingsWindow.cs
View file

@ -99,7 +99,7 @@ namespace Dalamud.Interface.Internal.Windows
this.doMbCollect = configuration.IsMbCollect; this.doMbCollect = configuration.IsMbCollect;
this.globalUiScale = configuration.GlobalUiScale; this.globalUiScale = configuration.GlobalUiScale;
this.fontGamma = configuration.FontGamma; this.fontGamma = configuration.FontGammaLevel;
this.doUseAxisFontsFromGame = configuration.UseAxisFontsFromGame; this.doUseAxisFontsFromGame = configuration.UseAxisFontsFromGame;
this.fontResolutionLevel = configuration.FontResolutionLevel; this.fontResolutionLevel = configuration.FontResolutionLevel;
this.doToggleUiHide = configuration.ToggleUiHide; this.doToggleUiHide = configuration.ToggleUiHide;
@ -197,7 +197,7 @@ namespace Dalamud.Interface.Internal.Windows
var configuration = Service<DalamudConfiguration>.Get(); var configuration = Service<DalamudConfiguration>.Get();
var interfaceManager = Service<InterfaceManager>.Get(); var interfaceManager = Service<InterfaceManager>.Get();
var rebuildFont = interfaceManager.FontGamma != configuration.FontGamma; var rebuildFont = interfaceManager.FontGamma != configuration.FontGammaLevel;
ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale; ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale;
interfaceManager.FontGammaOverride = null; interfaceManager.FontGammaOverride = null;
@ -930,7 +930,7 @@ namespace Dalamud.Interface.Internal.Windows
configuration.UseAxisFontsFromGame = this.doUseAxisFontsFromGame; configuration.UseAxisFontsFromGame = this.doUseAxisFontsFromGame;
configuration.FontResolutionLevel = this.fontResolutionLevel; configuration.FontResolutionLevel = this.fontResolutionLevel;
configuration.FontGamma = this.fontGamma; configuration.FontGammaLevel = this.fontGamma;
// This is applied every frame in InterfaceManager::CheckViewportState() // This is applied every frame in InterfaceManager::CheckViewportState()
configuration.IsDisableViewport = !this.doViewport; configuration.IsDisableViewport = !this.doViewport;