diff --git a/Dalamud/Interface/DalamudSettingsWindow.cs b/Dalamud/Interface/DalamudSettingsWindow.cs
index 8876295af..dd13888ae 100644
--- a/Dalamud/Interface/DalamudSettingsWindow.cs
+++ b/Dalamud/Interface/DalamudSettingsWindow.cs
@@ -99,8 +99,8 @@ namespace Dalamud.Interface
ImGui.Dummy(new Vector2(10f, 10f));
- ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHide", "Hide plugin UI when the game UI is hidden"), ref this.doToggleUiHide);
- ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingToggleUiHideHint", "Check this box to hide any open windows by plugins when toggling the game overlay."));
+ ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHide", "Hide plugin UI when the game UI is hidden and during cutscenes and gpose"), ref this.doToggleUiHide);
+ ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingToggleUiHideHint", "Check this box to hide any open windows by plugins when toggling the game overlay, or upon entering gpose or a cutscene."));
ImGui.EndTabItem();
}
diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
index 10c213bd6..5cb58dc64 100644
--- a/Dalamud/Interface/UiBuilder.cs
+++ b/Dalamud/Interface/UiBuilder.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Dalamud.Game.ClientState;
using Dalamud.Game.Internal.Gui;
using ImGuiNET;
using ImGuiScene;
@@ -38,9 +39,12 @@ namespace Dalamud.Interface
///
public bool DisableAutomaticUiHide { get; set; } = false;
- private readonly InterfaceManager interfaceManager;
- private readonly GameGui gameGui;
- private readonly DalamudConfiguration config;
+ private bool CutsceneOrGposeActive => this.dalamud.ClientState != null && this.dalamud.ClientState.Condition[ConditionFlag.OccupiedInCutSceneEvent] ||
+ this.dalamud.ClientState.Condition[ConditionFlag.WatchingCutscene] ||
+ this.dalamud.ClientState.Condition[ConditionFlag.WatchingCutscene78];
+
+ private Dalamud dalamud;
+
#if DEBUG
internal static bool DoStats { get; set; } = true;
#else
@@ -56,13 +60,11 @@ namespace Dalamud.Interface
///
/// The interface manager to register on.
/// The plugin namespace.
- internal UiBuilder(InterfaceManager interfaceManager, GameGui gameGui, DalamudConfiguration config, string namespaceName) {
+ internal UiBuilder(Dalamud dalamud, string namespaceName) {
this.namespaceName = namespaceName;
- this.interfaceManager = interfaceManager;
- this.gameGui = gameGui;
- this.config = config;
- this.interfaceManager.OnDraw += OnDraw;
+ this.dalamud = dalamud;
+ this.dalamud.InterfaceManager.OnDraw += OnDraw;
this.stopwatch = new System.Diagnostics.Stopwatch();
}
@@ -70,7 +72,7 @@ namespace Dalamud.Interface
/// Unregister the UiBuilder. Do not call this in plugin code.
///
public void Dispose() {
- this.interfaceManager.OnDraw -= OnDraw;
+ this.dalamud.InterfaceManager.OnDraw -= OnDraw;
}
///
@@ -79,7 +81,7 @@ namespace Dalamud.Interface
/// The full filepath to the image.
/// A object wrapping the created image. Use inside ImGui.Image()
public TextureWrap LoadImage(string filePath) =>
- this.interfaceManager.LoadImage(filePath);
+ this.dalamud.InterfaceManager.LoadImage(filePath);
///
/// Loads an image from a byte stream, such as a png downloaded into memory.
@@ -87,7 +89,7 @@ namespace Dalamud.Interface
/// A byte array containing the raw image data.
/// A object wrapping the created image. Use inside ImGui.Image()
public TextureWrap LoadImage(byte[] imageData) =>
- this.interfaceManager.LoadImage(imageData);
+ this.dalamud.InterfaceManager.LoadImage(imageData);
///
/// Loads an image from raw unformatted pixel data, with no type or header information. To load formatted data, use .
@@ -98,7 +100,7 @@ namespace Dalamud.Interface
/// The number of channels (bytes per pixel) of the image contained in . This should usually be 4.
/// A object wrapping the created image. Use inside ImGui.Image()
public TextureWrap LoadImageRaw(byte[] imageData, int width, int height, int numChannels) =>
- this.interfaceManager.LoadImageRaw(imageData, width, height, numChannels);
+ this.dalamud.InterfaceManager.LoadImageRaw(imageData, width, height, numChannels);
///
/// An event that is called any time ImGui fonts need to be rebuilt.
@@ -109,8 +111,8 @@ namespace Dalamud.Interface
///
public Action OnBuildFonts
{
- get { return this.interfaceManager.OnBuildFonts; }
- set { this.interfaceManager.OnBuildFonts = value; }
+ get { return this.dalamud.InterfaceManager.OnBuildFonts; }
+ set { this.dalamud.InterfaceManager.OnBuildFonts = value; }
}
///
@@ -119,7 +121,7 @@ namespace Dalamud.Interface
/// ready to be used on the next UI frame.
///
public void RebuildFonts() =>
- this.interfaceManager.RebuildFonts();
+ this.dalamud.InterfaceManager.RebuildFonts();
///
/// Event that is fired when the plugin should open its configuration interface.
@@ -130,7 +132,7 @@ namespace Dalamud.Interface
private void OnDraw() {
- if (this.gameGui.GameUiHidden && this.config.ToggleUiHide && !DisableAutomaticUiHide)
+ if ((this.dalamud.Framework.Gui.GameUiHidden || CutsceneOrGposeActive) && this.dalamud.Configuration.ToggleUiHide && !DisableAutomaticUiHide)
return;
ImGui.PushID(this.namespaceName);
diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs
index 6f39c2d2b..71e720c2b 100644
--- a/Dalamud/Plugin/DalamudPluginInterface.cs
+++ b/Dalamud/Plugin/DalamudPluginInterface.cs
@@ -75,7 +75,7 @@ namespace Dalamud.Plugin
this.CommandManager = dalamud.CommandManager;
this.Framework = dalamud.Framework;
this.ClientState = dalamud.ClientState;
- this.UiBuilder = new UiBuilder(dalamud.InterfaceManager, dalamud.Framework.Gui, dalamud.Configuration, pluginName);
+ this.UiBuilder = new UiBuilder(dalamud.InterfaceManager, dalamud.Framework.Gui, dalamud.Configuration, dalamud.ClientState, pluginName);
this.TargetModuleScanner = dalamud.SigScanner;
this.Data = dalamud.Data;
this.SeStringManager = dalamud.SeStringManager;