Modular UI

Ktisis/Configuration.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Numerics;
 using System.Collections.Generic;
@@ -11,6 +11,7 @@
 using Dalamud.Game.ClientState.Keys;
 
 using Ktisis.Interface;
+using Ktisis.Interface.Modular;
 using Ktisis.Localization;
 using Ktisis.Structs.Bones;
 using Ktisis.Structs.Actor.Equip.SetSources;
@@ -34,6 +35,8 @@ public class Configuration : IPluginConfiguration {
 		public bool AutoOpenCtor { get; set; } = false;
 		public OpenKtisisMethod OpenKtisisMethod { get; set; } = OpenKtisisMethod.OnEnterGpose;
 
+		public List<IModularItem> ModularConfig { get; set; } = new();
+		public bool ModularHideDefaultWorkspace { get; set; } = false;
 		public bool DisplayCharName { get; set; } = true;
 		public bool CensorNsfw { get; set; } = true;
 
@@ -138,9 +141,10 @@ public bool IsBoneCategoryVisible(Category category) {
 
 		public Dictionary<string, string> SavedDirPaths { get; set; } = new();
 
-		// Data memory
+		// Data
 		public Dictionary<string, GlamourDresser.GlamourPlate[]?>? GlamourPlateData { get; set; } = null;
 		public Dictionary<string, Dictionary<string, Vector3>> CustomBoneOffset { get; set; } = new();
+		public bool ClipboardExportClearJson { get; set; } = false;
 
 		// Validate for changes in config versions.
 

Ktisis/Interface/Components/ActorsList.cs

@@ -16,7 +16,7 @@ namespace Ktisis.Interface.Components {
 	internal static class ActorsList {
 
 		private static List<long> SavedObjects = new();
-		private static List<DalamudGameObject>? SelectorList = null;
+		internal static List<DalamudGameObject>? SelectorList = null;
 		private static string Search = "";
 		private static readonly HashSet<ObjectKind> WhitelistObjectKinds = new(){
 				ObjectKind.Player,
@@ -32,7 +32,7 @@ internal static class ActorsList {
 
 		// Draw
 
-		public unsafe static void Draw() {
+		public unsafe static void Draw(bool isHorizontal = false) {
 			// Prevent displaying the same target multiple time
 			SavedObjects = SavedObjects.Distinct().ToList();
 
@@ -44,20 +44,26 @@ public unsafe static void Draw() {
 			SavedObjects.RemoveAll(o => !IsValidActor(o));
 
 			var buttonSize = new Vector2(ImGui.GetContentRegionAvail().X, ControlButtons.ButtonSize.Y);
-			if (ImGui.CollapsingHeader("Actor List")) {
-				long? toRemove = null;
-				foreach (var pointer in SavedObjects) {
-					if (!IsValidActor(pointer)) continue;
-					if (ImGui.Button($"{((Actor*)pointer)->GetNameOrId()}{ExtraInfo(pointer)}##ActorList##{pointer}", buttonSize))
-						Services.Targets->GPoseTarget = (GameObject*)pointer;
-					if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
-						toRemove = pointer;
-				}
-				if (toRemove != null) SavedObjects.Remove((long)toRemove);
 
-				if (GuiHelpers.IconButtonTooltip(Dalamud.Interface.FontAwesomeIcon.Plus, "Add Actor", ControlButtons.ButtonSize))
-					OpenSelector();
+			long? toRemove = null;
+			foreach (var pointer in SavedObjects) {
+				if (!IsValidActor(pointer)) continue;
+
+				var buttonText = $"{((Actor*)pointer)->GetNameOrId()}{ExtraInfo(pointer)}";
+
+				if (isHorizontal) buttonSize.X = ImGui.CalcTextSize(buttonText).X + ControlButtons.ButtonSize.X;
+				if (ImGui.Button($"{buttonText}##ActorList##{pointer}", buttonSize))
+					Services.Targets->GPoseTarget = (GameObject*)pointer;
+				if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
+					toRemove = pointer;
+				if (isHorizontal) ImGui.SameLine();
+			}
+			if (toRemove != null) SavedObjects.Remove((long)toRemove);
+
+			if (GuiHelpers.IconButtonTooltip(Dalamud.Interface.FontAwesomeIcon.Plus, "Add Actor", ControlButtons.ButtonSize))
+				OpenSelector();
 
+			if (!isHorizontal) {
 				ImGui.SameLine(ImGui.GetContentRegionAvail().X - (ImGui.GetStyle().ItemSpacing.X) - GuiHelpers.CalcIconSize(FontAwesomeIcon.InfoCircle).X);
 				ControlButtons.VerticalAlignTextOnButtonSize();
 
@@ -68,8 +74,6 @@ public unsafe static void Draw() {
 					ImGui.Text("Right click to remove an Actor from the list");
 					ImGui.EndTooltip();
 				}
-				if (SelectorList != null)
-					DrawListAddActor();
 			}
 		}
 
@@ -94,7 +98,7 @@ private static void OpenSelector() =>
 
 		private static void CloseSelector() => SelectorList = null;
 
-		private unsafe static void DrawListAddActor() {
+		internal unsafe static void DrawListAddActor() {
 			PopupSelect.HoverPopupWindow(
 				PopupSelect.HoverPopupWindowFlags.SelectorList | PopupSelect.HoverPopupWindowFlags.SearchBar,
 				SelectorList!,

Ktisis/Interface/Components/AnimationControls.cs

@@ -10,18 +10,17 @@ namespace Ktisis.Interface.Components {
 	public static class AnimationControls {
 
 
-		public static unsafe void Draw(GameObject? target) {
-			// Animation control
-			if (ImGui.CollapsingHeader("Animation Control")) {
-				var control = PoseHooks.GetAnimationControl(target);
-				if (PoseHooks.PosingEnabled || !Ktisis.IsInGPose || PoseHooks.IsGamePlaybackRunning(target) || control == null) {
-					ImGui.Text("Animation Control is available when:");
-					ImGui.BulletText("Game animation is paused");
-					ImGui.BulletText("Posing is off");
-				} else
-					AnimationSeekAndSpeed(control);
-			}
+		public static unsafe void Draw() {
+			var target = Ktisis.GPoseTarget;
 
+			// Animation control
+			var control = PoseHooks.GetAnimationControl(target);
+			if (PoseHooks.PosingEnabled || !Ktisis.IsInGPose || PoseHooks.IsGamePlaybackRunning(target) || control == null) {
+				ImGui.Text("Animation Control is available when:");
+				ImGui.BulletText("Game animation is paused");
+				ImGui.BulletText("Posing is off");
+			} else
+				AnimationSeekAndSpeed(control);
 		}
 		public static unsafe void AnimationSeekAndSpeed(hkaDefaultAnimationControl* control) {
 			var duration = control->hkaAnimationControl.Binding.ptr->Animation.ptr->Duration;

Ktisis/Interface/Components/BoneTree.cs

@@ -13,23 +13,24 @@ public class BoneTree {
 		private static Vector2 _FrameMin;
 		private static Vector2 _FrameMax;
 
-		public static unsafe void Draw(Actor* actor) {
-			if (ImGui.CollapsingHeader("Bone List")) {
-				var lineHeight = ImGui.GetTextLineHeight();
-				if (ImGui.BeginChildFrame(471, new Vector2(-1, lineHeight * 12), ImGuiWindowFlags.HorizontalScrollbar)) {
-					if (actor == null || actor->Model == null || actor->Model->Skeleton == null)
-						return;
-
-					var body = actor->Model->Skeleton->GetBone(0, 1);
-					if (body != null && body.Pose != null)
-						DrawBoneTreeNode(body);
-
-					ImGui.EndChildFrame();
-
-					_FrameMin = ImGui.GetItemRectMin();
-					_FrameMax.X = ImGui.GetItemRectMax().X;
-					_FrameMax.Y = _FrameMin.Y + lineHeight * 11;
-				}
+		public static unsafe void Draw() {
+			var actor = Ktisis.Target;
+			if (actor->Model == null) return;
+
+			var lineHeight = ImGui.GetTextLineHeight();
+			if (ImGui.BeginChildFrame(471, new Vector2(-1, lineHeight * 12), ImGuiWindowFlags.HorizontalScrollbar)) {
+				if (actor == null || actor->Model == null || actor->Model->Skeleton == null)
+					return;
+
+				var body = actor->Model->Skeleton->GetBone(0, 1);
+				if (body != null && body.Pose != null)
+					DrawBoneTreeNode(body);
+
+				ImGui.EndChildFrame();
+
+				_FrameMin = ImGui.GetItemRectMin();
+				_FrameMax.X = ImGui.GetItemRectMax().X;
+				_FrameMax.Y = _FrameMin.Y + lineHeight * 11;
 			}
 		}
 		private unsafe static void DrawBoneTreeNode(Bone bone) {

Ktisis/Interface/Components/Categories.cs

@@ -47,6 +47,17 @@ public static bool DrawConfigList(Configuration cfg) {
 			});
 		}
 
+
+		public static void DrawToggleListWithHint() {
+			if (!DrawToggleList(Ktisis.Configuration)) {
+				ImGui.Text("No bone found.");
+				ImGui.Text("Show Skeleton (");
+				ImGui.SameLine();
+				GuiHelpers.Icon(FontAwesomeIcon.EyeSlash);
+				ImGui.SameLine();
+				ImGui.Text(") to fill this.");
+			}
+		}
 		public static bool DrawToggleList(Configuration cfg) {
 			if (!DrawList(category => {
 

Ktisis/Interface/Components/ControlButtons.cs

@@ -21,9 +21,19 @@ public static class ControlButtons {
 		private static bool IsSettingsHovered = false;
 		private static bool IsSettingsActive = false;
 
+
 		// utils
 		public static void VerticalAlignTextOnButtonSize(float percentage = 0.667f) => ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (ButtonSize.Y / 2 - ImGui.GetFontSize() * percentage)); // align text with button size
 
+		public static void DrawGizmoOperations() {
+			ButtonChangeOperation(OPERATION.TRANSLATE, IconsPool.Position);
+			ImGui.SameLine();
+			ButtonChangeOperation(OPERATION.ROTATE, IconsPool.Rotation);
+			ImGui.SameLine();
+			ButtonChangeOperation(OPERATION.SCALE, IconsPool.Scale);
+			ImGui.SameLine();
+			ButtonChangeOperation(OPERATION.UNIVERSAL, IconsPool.Universal);
+		}
 		public static void DrawExtra() {
 			var gizmode = Ktisis.Configuration.GizmoMode;
 			if (GuiHelpers.IconButtonTooltip(gizmode == MODE.WORLD ? FontAwesomeIcon.Globe : FontAwesomeIcon.Home, "Local / World orientation mode switch.", ButtonSize))
@@ -69,17 +79,25 @@ private static void DrawInfo() {
 
 			GuiHelpers.Tooltip("Information");
 		}
-		private static void DrawSettings() {
-			ImGui.PushStyleColor(ImGuiCol.Button, 0x00000000);
-			ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 200f);
-			ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, new Vector2(ImGui.GetFontSize() * 0.25f));
-
-			if (GuiHelpers.IconButton(FontAwesomeIcon.Cog, new(ImGui.GetFontSize() * 1.5f)))
+		internal static void DrawSettings(int flags = 1) {
+			var isTitleDecoration = (flags & 1) != 0;
+
+			Vector2 buttonSize = ButtonSize;
+			if (isTitleDecoration) {
+				ImGui.PushStyleColor(ImGuiCol.Button, 0x00000000);
+				ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 200f);
+				ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, new Vector2(ImGui.GetFontSize() * 0.25f));
+				buttonSize = new(ImGui.GetFontSize() * 1.5f);
+			}
+
+			if (GuiHelpers.IconButton(FontAwesomeIcon.Cog, buttonSize))
 				if (ConfigGui.Visible) ConfigGui.Hide();
 				else ConfigGui.Show();
 
-			ImGui.PopStyleColor();
-			ImGui.PopStyleVar(2);
+			if (isTitleDecoration) {
+				ImGui.PopStyleColor();
+				ImGui.PopStyleVar(2);
+			}
 
 			IsSettingsHovered = ImGui.IsItemHovered();
 			IsSettingsActive = ImGui.IsItemActive();
@@ -144,6 +162,7 @@ public static void ButtonChangeOperation(OPERATION operation, FontAwesomeIcon ic
 
 		// Independant from the others
 		public static void DrawPoseSwitch() {
+			ImGui.AlignTextToFramePadding();
 			ImGui.SetCursorPosX(ImGui.CalcTextSize("GPose Disabled").X + (ImGui.GetFontSize() * 8) + ImGui.GetStyle().ItemSpacing.X + GuiHelpers.CalcIconSize(FontAwesomeIcon.Cog).X); // Prevents text overlap
 
 			ImGui.BeginDisabled(!Ktisis.IsInGPose);
@@ -156,6 +175,7 @@ public static void DrawPoseSwitch() {
 			if (Ktisis.IsInGPose) ImGui.PopStyleColor();
 			ImGui.SameLine();
 
+
 			if (!Ktisis.IsInGPose)
 				ImGuiComponents.DisabledToggleButton("Toggle Posing", false);
 			else
@@ -188,5 +208,11 @@ private static string SiblingLinkToTooltip(SiblingLink siblingLink)
 				SiblingLink.RotationMirrorX => "Mirror rotation",
 				_ => "No sibling link"
 			};
+
+		public static void DrawParentingCheckbox() {
+			var parent = Ktisis.Configuration.EnableParenting;
+			if (ImGui.Checkbox("Parenting", ref parent))
+				Ktisis.Configuration.EnableParenting = parent;
+		}
 	}
 }

Ktisis/Interface/Components/PopupSelect.cs

@@ -107,8 +107,9 @@ public static void HoverPopupWindow<T>(
 				if (ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows) && !ImGui.IsAnyItemActive() && !ImGui.IsMouseClicked(ImGuiMouseButton.Left))
 					ImGui.SetKeyboardFocusHere(flags.HasFlag(HoverPopupWindowFlags.SearchBar) ? -1 : 0); // TODO: verify the keyboarf focus behaviour when searchbar is disabled
 
+				bool isListBoxOpened = false;
 				if (flags.HasFlag(HoverPopupWindowFlags.SelectorList))
-					ImGui.BeginListBox(listLabel, new Vector2(-1, 300));
+					isListBoxOpened = ImGui.BeginListBox(listLabel, new Vector2(-1, 300));
 				// box has began
 
 				if (flags.HasFlag(HoverPopupWindowFlags.Header)) {
@@ -172,7 +173,7 @@ public static void HoverPopupWindow<T>(
 
 
 				// box has ended
-				if (flags.HasFlag(HoverPopupWindowFlags.SelectorList))
+				if (flags.HasFlag(HoverPopupWindowFlags.SelectorList) && isListBoxOpened)
 					ImGui.EndListBox();
 				HoverPopupWindowFocus |= ImGui.IsItemActive();
 

Ktisis/Interface/Components/TransformTable.cs

@@ -68,9 +68,6 @@ public void Update(Vector3 pos, Quaternion rot, Vector3 scale) {
 		public bool DrawTable() {
 			var result = false;
 
-			var iconPosition = FontAwesomeIcon.LocationArrow;
-			var iconRotation = FontAwesomeIcon.Sync;
-			var iconScale = FontAwesomeIcon.ExpandAlt;
 
 			FetchConfigurations();
 
@@ -86,17 +83,17 @@ public bool DrawTable() {
 			// Position
 			result |= ColoredDragFloat3("##Position", ref Position, BaseSpeedPos * multiplier, axisColors);
 			ImGui.SameLine();
-			ControlButtons.ButtonChangeOperation(OPERATION.TRANSLATE, iconPosition);
-
+			ControlButtons.ButtonChangeOperation(OPERATION.TRANSLATE, IconsPool.Position);
+ 
 			// Rotation
 			result |= ColoredDragFloat3("##Rotation", ref Rotation, BaseSpeedRot * multiplier, axisColors);
 			ImGui.SameLine();
-			ControlButtons.ButtonChangeOperation(OPERATION.ROTATE, iconRotation);
-
+			ControlButtons.ButtonChangeOperation(OPERATION.ROTATE, IconsPool.Rotation);
+ 
 			// Scale
 			result |= ColoredDragFloat3("##Scale", ref Scale, BaseSpeedSca * multiplier, axisColors);
 			ImGui.SameLine();
-			ControlButtons.ButtonChangeOperation(OPERATION.SCALE, iconScale);
+			ControlButtons.ButtonChangeOperation(OPERATION.SCALE, IconsPool.Scale);
 
 			IsEditing = result;