Make ToolbarWindow toggleable via command

Ktisis/Events/EventManager.cs

@@ -10,7 +10,7 @@
 
 namespace Ktisis.Events {
 	public static class EventManager {
-		public delegate void GPoseChange(ActorGposeState state);
+		public delegate void GPoseChange(bool isInGPose);
 		public static GPoseChange? OnGPoseChange = null;
 
 		public delegate void TransformationMatrixChange(bool state);
@@ -25,9 +25,9 @@ public static class EventManager {
 		internal delegate void KeyReleaseEventDelegate(VirtualKey key);
 		internal static KeyReleaseEventDelegate? OnKeyReleased;
 
-		public static void FireOnGposeChangeEvent(ActorGposeState state) {
-			Logger.Debug($"FireOnGposeChangeEvent {state}");
-			OnGPoseChange?.Invoke(state);
+		public static void FireOnGposeChangeEvent(bool isInGPose) {
+			Logger.Debug("FireOnGposeChangeEvent {0}", isInGPose ? "ON" : "OFF");
+			OnGPoseChange?.Invoke(isInGPose);
 		}
 
 		public static unsafe void FireOnTransformationMatrixChangeEvent(bool state) {

Ktisis/History/HistoryManager.cs

@@ -67,7 +67,7 @@ public static void Undo() {
 			_currentIdx--;
 		}
 
-		internal static void OnGPoseChange(ActorGposeState _state) {
+		internal static void OnGPoseChange(bool isInGpose) {
 			Logger.Verbose("Clearing previous history...");
 			_currentIdx = 0;
 			_maxIdx = 0;

Ktisis/Interface/Windows/ConfigGui.cs

@@ -13,6 +13,7 @@
 using Dalamud.Interface.Components;
 using Dalamud.Game.ClientState.Keys;
 
+using Ktisis.Interface.Windows.Toolbar;
 using Ktisis.Util;
 using Ktisis.Overlay;
 using Ktisis.Localization;
@@ -149,8 +150,10 @@ public static void DrawInterfaceTab(Configuration cfg) {
 				cfg.TransformTableDisplayMultiplierInputs = displayMultiplierInputs;
 
 			var showToolbar = cfg.ShowToolbar;
-			if (ImGui.Checkbox("Show Experimental Toolbar", ref showToolbar))
+			if (ImGui.Checkbox("Show Experimental Toolbar", ref showToolbar)) {
 				cfg.ShowToolbar = showToolbar;
+				ToolbarWindow.Visible = showToolbar;
+			}
 
 			ImGui.Spacing();
 			ImGui.Separator();

Ktisis/Interface/Windows/Toolbar/ToolbarWindow.cs

@@ -8,21 +8,38 @@
 
 using Ktisis.History;
 using Ktisis.Interface.Components;
+using Ktisis.Events;
 using Ktisis.Interface.Windows.ActorEdit;
 using Ktisis.Interop.Hooks;
 using Ktisis.Overlay;
 using Ktisis.Util;
 
 namespace Ktisis.Interface.Windows.Toolbar {
 	public static class ToolbarWindow {
-		private static bool Visible = true;
+		internal static bool Visible = false;
 
 		// Toggle visibility
 		public static void Toggle() => Visible = !Visible;
 
+		public static void Init() {
+			EventManager.OnGPoseChange += OnGPoseStateChange;
+		}
+
+		public static void Dispose() {
+			EventManager.OnGPoseChange -= OnGPoseStateChange;
+		}
+
+		public static void OnGPoseStateChange(bool isInGPose) {
+			if (isInGPose) {
+				if (Ktisis.Configuration.ShowToolbar)
+					Visible = true;
+			} else
+				Visible = false;
+		}
+
 		// Draw window
 		public static void Draw() {
-			if (!Visible || !Ktisis.IsInGPose || !Ktisis.Configuration.ShowToolbar)
+			if (!Visible)
 				return;
 
 			AdvancedWindow.Draw();

Ktisis/Interface/Windows/Workspace/Workspace.cs

@@ -41,9 +41,9 @@ public static class Workspace {
 		public static void Show() => Visible = true;
 		public static void Toggle() => Visible = !Visible;
 
-		public static void OnEnterGposeToggle(Structs.Actor.State.ActorGposeState gposeState) {
+		public static void OnEnterGposeToggle(bool isInGpose) {
 			if (Ktisis.Configuration.OpenKtisisMethod == OpenKtisisMethod.OnEnterGpose)
-				Visible = gposeState == Structs.Actor.State.ActorGposeState.ON;
+				Visible = isInGpose;
 		}
 
 		public static float PanelHeight => ImGui.GetTextLineHeight() * 2 + ImGui.GetStyle().ItemSpacing.Y + ImGui.GetStyle().FramePadding.Y;

Ktisis/Ktisis.cs

@@ -13,6 +13,7 @@
 using Ktisis.Structs.Actor;
 using Ktisis.History;
 using Ktisis.Events;
+using Ktisis.Interface.Windows.Toolbar;
 using Ktisis.Overlay;
 
 namespace Ktisis {
@@ -68,6 +69,7 @@ public Ktisis(DalamudPluginInterface pluginInterface) {
 
 			Input.Init();
 			ActorStateWatcher.Init();
+			ToolbarWindow.Init();
 
 			// Register command
 
@@ -102,7 +104,7 @@ public void Dispose() {
 			Interop.Hooks.PoseHooks.Dispose();
 
 			Interop.Alloc.Dispose();
-			ActorStateWatcher.Instance.Dispose();
+			ActorStateWatcher.Dispose();
 			EventManager.OnGPoseChange -= Workspace.OnEnterGposeToggle;
 
 			Data.Sheets.Cache.Clear();
@@ -112,6 +114,7 @@ public void Dispose() {
 
 			Input.Dispose();
 			HistoryManager.Dispose();
+			ToolbarWindow.Dispose();
 
 			foreach (var (_, texture) in References.Textures) {
 				texture.Dispose();
@@ -131,6 +134,13 @@ private void OnCommand(string command, string arguments) {
 				case "configuration":
 					ConfigGui.Toggle();
 					break;
+				case "toolbar":
+					if (IsInGPose) {
+						ToolbarWindow.Toggle();
+					} else {
+						/* TODO: Throw a warning up? */
+					}
+					break;
 				default:
 					Workspace.Toggle();
 					break;

Ktisis/Structs/Actor/State/ActorStateWatcher.cs

@@ -3,44 +3,24 @@
 using System;
 
 namespace Ktisis.Structs.Actor.State {
-	public sealed class ActorStateWatcher : IDisposable {
+	public static class ActorStateWatcher {
 
-		private static ActorStateWatcher? _instance;
+		private static bool _wasInGPose = false;
 
-		private ActorGposeState _gposeState = ActorGposeState.OFF;
-
-		public static ActorStateWatcher Instance {
-			get {
-				if (_instance == null) {
-					_instance = new ActorStateWatcher();
-				}
-				return _instance;
-			}
-		}
-
-		private ActorStateWatcher() {
-			Services.Framework.Update += Monitor;
-		}
-
-		public void Dispose() {
+		public static void Dispose() {
 			Services.Framework.Update -= Monitor;
 			if(Ktisis.IsInGPose)
-				EventManager.FireOnGposeChangeEvent(ActorGposeState.OFF);
+				EventManager.FireOnGposeChangeEvent(false);
 		}
 
 		public static void Init() {
-			_ = Instance;
+			Services.Framework.Update += Monitor;
 		}
 
-		public void Monitor(Framework framework) {
-			if (_gposeState == ActorGposeState.OFF && Ktisis.IsInGPose) {
-				_gposeState = ActorGposeState.ON;
-				EventManager.FireOnGposeChangeEvent(_gposeState);
-			}
-
-			if (_gposeState == ActorGposeState.ON && !Ktisis.IsInGPose) {
-				_gposeState = ActorGposeState.OFF;
-				EventManager.FireOnGposeChangeEvent(_gposeState);
+		public static void Monitor(Framework framework) {
+			if (_wasInGPose != Ktisis.IsInGPose) {
+				_wasInGPose = Ktisis.IsInGPose;
+				EventManager.FireOnGposeChangeEvent(Ktisis.IsInGPose);
 			}
 		}
 	}