From 79a5cc1ed404edb1ab1a386f607e8ab726542948 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Thu, 15 Apr 2021 22:09:07 +0200 Subject: [PATCH] refactor: rename IsNeverViewport to IsDisableViewport --- Dalamud/Configuration/DalamudConfiguration.cs | 2 +- Dalamud/Interface/DalamudSettingsWindow.cs | 4 ++-- Dalamud/Interface/InterfaceManager.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs index 2d84ec476..d4e5b8734 100644 --- a/Dalamud/Configuration/DalamudConfiguration.cs +++ b/Dalamud/Configuration/DalamudConfiguration.cs @@ -115,7 +115,7 @@ namespace Dalamud.Configuration /// /// Gets or sets a value indicating whether viewports should always be disabled. /// - public bool IsNeverViewport { get; set; } = true; + public bool IsDisableViewport { get; set; } = true; /// /// Load a configuration from the provided path. diff --git a/Dalamud/Interface/DalamudSettingsWindow.cs b/Dalamud/Interface/DalamudSettingsWindow.cs index c11bfa82f..d358d269f 100644 --- a/Dalamud/Interface/DalamudSettingsWindow.cs +++ b/Dalamud/Interface/DalamudSettingsWindow.cs @@ -37,7 +37,7 @@ namespace Dalamud.Interface this.doToggleUiHideDuringGpose = this.dalamud.Configuration.ToggleUiHideDuringGpose; this.doDocking = this.dalamud.Configuration.IsDocking; - this.doViewport = !this.dalamud.Configuration.IsNeverViewport; + this.doViewport = !this.dalamud.Configuration.IsDisableViewport; this.doPluginTest = this.dalamud.Configuration.DoPluginTest; this.thirdRepoList = this.dalamud.Configuration.ThirdRepoList.Select(x => x.Clone()).ToList(); @@ -375,7 +375,7 @@ namespace Dalamud.Interface this.dalamud.Configuration.IsDocking = this.doDocking; // This is applied every frame in InterfaceManager::CheckViewportState() - this.dalamud.Configuration.IsNeverViewport = !this.doViewport; + this.dalamud.Configuration.IsDisableViewport = !this.doViewport; // Apply docking flag if (!this.dalamud.Configuration.IsDocking) diff --git a/Dalamud/Interface/InterfaceManager.cs b/Dalamud/Interface/InterfaceManager.cs index 35412d5bb..664bdb198 100644 --- a/Dalamud/Interface/InterfaceManager.cs +++ b/Dalamud/Interface/InterfaceManager.cs @@ -294,7 +294,7 @@ namespace Dalamud.Interface private void CheckViewportState() { - if (this.dalamud.Configuration.IsNeverViewport || this.scene.SwapChain.IsFullScreen || ImGui.GetPlatformIO().Monitors.Size == 1) + if (this.dalamud.Configuration.IsDisableViewport || this.scene.SwapChain.IsFullScreen || ImGui.GetPlatformIO().Monitors.Size == 1) { ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.ViewportsEnable; return;