Hide stopwatch in cutscenes option, fixes #68

xorus · Oct 5, 2024 · d6d5151 · d6d5151
1 parent 8173ff5
commit d6d5151
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 2 deletions.
diff --git a/Plugin/Configuration/FloatingWindowConfiguration.cs b/Plugin/Configuration/FloatingWindowConfiguration.cs
@@ -50,6 +50,9 @@ public class FloatingWindowConfiguration
 
     [AutoField("Settings_FWTab_DisplayStopwatchOnlyInDuty")]
     public bool StopwatchOnlyInDuty { get; set; } = false;
+
+    [AutoField("Settings_FWTab_HideInCutscenes")]
+    public bool HideInCutscenes { get; set; } = true;
 
     [AutoField("Settings_FWTab_StopwatchAsSeconds")]
     public bool StopwatchAsSeconds { get; set; } = false;

diff --git a/Plugin/EngageTimer.csproj b/Plugin/EngageTimer.csproj
@@ -8,7 +8,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-        <AssemblyVersion>2.4.0.1</AssemblyVersion>
+        <AssemblyVersion>2.4.1.0</AssemblyVersion>
         <Deterministic>false</Deterministic>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Plugin/Game/CountdownHook.cs b/Plugin/Game/CountdownHook.cs
@@ -63,6 +63,7 @@ public void Update()
         if (_state.Mocked) return;
         UpdateCountDown();
         _state.InInstance = Plugin.Condition[ConditionFlag.BoundByDuty];
+        _state.InCutscene = Plugin.Condition[ConditionFlag.OccupiedInCutSceneEvent];
     }
 
     private void UpdateCountDown()

diff --git a/Plugin/Properties/Strings.resx b/Plugin/Properties/Strings.resx
@@ -641,4 +641,7 @@ help text for the /eg settings command</comment>
     <data name="Settings_FWTab_ForceHideWindowBorder" xml:space="preserve">
       <value>Hide window border</value>
     </data>
+    <data name="Settings_FWTab_HideInCutscenes" xml:space="preserve">
+      <value>Hide in cutscenes</value>
+    </data>
 </root>
diff --git a/Plugin/Status/State.cs b/Plugin/Status/State.cs
@@ -22,6 +22,7 @@ public class State
 {
     private bool _countingDown;
     private bool _inCombat;
+    public bool InCutscene { get; set; }
     public TimeSpan CombatDuration { get; set; }
     public DateTime CombatEnd { get; set; }
     public DateTime CombatStart { get; set; }

diff --git a/Plugin/Ui/FloatingWindow.cs b/Plugin/Ui/FloatingWindow.cs
@@ -55,6 +55,8 @@ private static bool StopwatchActive()
         var displayStopwatch = Plugin.Config.FloatingWindow.EnableStopwatch;
         if (!displayStopwatch) return false;
 
+        if (Plugin.Config.FloatingWindow.HideInCutscenes && Plugin.State.InCutscene) return false;
+
         if (Plugin.Config.FloatingWindow.AutoHide &&
             (DateTime.Now - Plugin.State.CombatEnd).TotalSeconds > Plugin.Config.FloatingWindow.AutoHideTimeout)
             return false;

diff --git a/Plugin/Ui/SettingsTab/FloatingWindowTab.cs b/Plugin/Ui/SettingsTab/FloatingWindowTab.cs
@@ -41,6 +41,7 @@ public static void Draw()
         Components.AutoField(Plugin.Config.FloatingWindow, "Lock");
         ImGuiComponents.HelpMarker(Strings.Settings_FWTab_Lock_Help);
 
+        Components.AutoField(Plugin.Config.FloatingWindow, "HideInCutscenes");
         Components.AutoField(Plugin.Config.FloatingWindow, "AutoHide");
         Components.AutoField(Plugin.Config.FloatingWindow, "AutoHideTimeout", sameLine: true);
 
@@ -51,7 +52,7 @@ public static void Draw()
 
         Components.AutoField(Plugin.Config.FloatingWindow, "EnableStopwatch");
         Components.AutoField(Plugin.Config.FloatingWindow, "DecimalStopwatchPrecision", sameLine: true);
-
+        
         ImGui.Separator();
         if (ImGui.CollapsingHeader(Translator.TrId("Settings_FWTab_Styling"))) FwStyling();
         ImGui.Separator();