From 36f0d1d87d9f3f70406a32bd9de1d896ef44c4d2 Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 11 Apr 2022 20:32:56 +0200 Subject: [PATCH 1/4] chore: FontGamma => FontGammaLevel --- Dalamud/Configuration/Internal/DalamudConfiguration.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Configuration/Internal/DalamudConfiguration.cs b/Dalamud/Configuration/Internal/DalamudConfiguration.cs index a5bbe6c9f..222dccab6 100644 --- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs +++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs @@ -141,7 +141,7 @@ namespace Dalamud.Configuration.Internal /// * ...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. /// - public float FontGamma { get; set; } = 1.4f; + public float FontGammaLevel { get; set; } = 1.4f; /// /// Gets or sets a value indicating the level of font resolution between 1 to 5. From c2bce23fc3583750fa1f73aae50819dc8be1849b Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 11 Apr 2022 20:43:51 +0200 Subject: [PATCH 2/4] 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; From 99f007a92fbf73a165debf529b854964a0cd2860 Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 11 Apr 2022 19:59:44 +0200 Subject: [PATCH 3/4] ci: deploy from all branches --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6620cbc1..335353b4f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: deploy_stg: name: Deploy dalamud-distrib staging - if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }} + if: ${{ github.event_name == 'push' }} needs: build runs-on: windows-latest steps: From dbbcc0f287c2c6ad73e8815b68857d179572eb0b Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 11 Apr 2022 21:16:50 +0200 Subject: [PATCH 4/4] ci: remove canary zip when branch is not applicable --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 335353b4f..6de36a06e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,6 +86,7 @@ jobs: echo "DVER=${newVersion}" >> $Env:GITHUB_ENV } else { Write-Host "Deployment folder doesn't exist. Not doing anything." + Remove-Item .\canary.zip } - name: Commit changes