Edit panels UI are almost done

Author: emyhrberg

Assets/DarkPanel.png

@@ -45,7 +45,7 @@ public override void DrawIcon(SpriteBatch spriteBatch, Rectangle position)
             //if (tex.Width > position.Width || tex.Height > position.Height)
             //scale = tex.Width > tex.Height ? position.Width / tex.Width : position.Height / tex.Height;
 
-            scale = 1.4f;
+            scale = 1.0f;
             Vector2 pos = new(position.Center.X + 0, position.Center.Y);
 
             spriteBatch.Draw(tex, pos, null, Color.White, 0, tex.Size() / 2f, scale, 0, 0);

Common/Integrations/DragonLens/DragonLensEditTool.cs

@@ -3,102 +3,123 @@
 using Terraria.GameContent.UI.Elements;
 using Terraria.ModLoader;
 using Terraria.UI;
+using UICustomizer.Edit.UI;
 using UICustomizer.EditMode.System;
 
-namespace UICustomizer.EditMode.UI
+namespace UICustomizer.EditMode.UI;
+public sealed class EditPanel : UIPanel
 {
-    public class EditPanel : UIPanel
+    private enum Subpanel { None, Positions, Layouts, Settings }
+
+    private readonly IconOptionButton _btnPositions;
+    private readonly IconOptionButton _btnLayouts;
+    private readonly IconOptionButton _btnSettings;
+
+    private readonly PositionsPanel _positions;
+    private readonly LayoutsPanel _layouts;
+    private readonly SettingsPanel _settings;
+
+    private Subpanel _active;
+
+    private const int IconSize = 40;
+    private static readonly Point SubPanelPos = new(70, 0);
+    private static readonly Point SubPanelSize = new(300, 300);
+
+    public EditPanel()
     {
-        private UIPanel positionsPanel;
-        private UIPanel layoutsPanel;
-        private UIPanel settingsPanel;
+        Width.Set(50, 0);
+        Top.Set(785, 0);
+        Left.Set(20, 0);
+        Height.Set(6 + IconSize + 6 + IconSize + 6 + IconSize + 6, 0);
+        SetPadding(0);
 
-        public EditPanel()
-        {
-            Width.Set(60, 0);
-            Height.Set(200, 0);
-            Top.Set(120, 0);
-            Left.Set(40, 0);
-
-            // Base colors (dark blue like Journey Mode UI)
-            BorderColor = new Color(89, 116, 213, 255) * 0.9f;
-            BackgroundColor = new Color(73, 94, 171) * 0.9f;
-
-            SetPadding(6);
-
-            // Create 3 icon buttons
-            var positionsButton = CreateIconButton(Ass.P.Value, 0, TogglePositions);
-            var layoutsButton = CreateIconButton(Ass.O.Value, 40, ToggleLayouts);
-            var settingsButton = CreateIconButton(Ass.S.Value, 80, ToggleSettings);
-
-            Append(positionsButton);
-            Append(layoutsButton);
-            Append(settingsButton);
-
-            // Create sub-panels (hidden initially)
-            positionsPanel = CreateSubPanel("I am a positions panel");
-            layoutsPanel = CreateSubPanel("I am a layouts panel");
-            settingsPanel = CreateSubPanel("I am a settings panel");
-        }
+        BorderColor = new Color(89, 116, 213) * 0.9f;
+        BackgroundColor = new Color(73, 94, 171) * 0.9f;
 
-        private UIImage CreateIconButton(Texture2D tex, float topOffset, UIElement.MouseEvent onClick)
-        {
-            var button = new UIImage(tex)
-            {
-                Width = new StyleDimension(32, 0),
-                Height = new StyleDimension(32, 0),
-                Top = new StyleDimension(topOffset, 0),
-                HAlign = 0.5f
-            };
-            button.OnLeftClick += onClick;
-            return button;
-        }
+        _btnPositions = new IconOptionButton(Ass.P, "Positions", 0);
+        _btnLayouts = new IconOptionButton(Ass.O, "Layouts", 1);
+        _btnSettings = new IconOptionButton(Ass.S, "Settings", 2);
 
-        private UIPanel CreateSubPanel(string labelText)
-        {
-            var panel = new UIPanel
-            {
-                Width = new StyleDimension(200, 0),
-                Height = new StyleDimension(120, 0),
-                Top = new StyleDimension(20, 0),
-                Left = new StyleDimension(70, 0),
-                BorderColor = new Color(89, 116, 213, 255) * 0.9f,
-                BackgroundColor = new Color(73, 94, 171) * 0.9f
-            };
-
-            var text = new UIText(labelText)
-            {
-                HAlign = 0.5f,
-                VAlign = 0.5f
-            };
-
-            panel.Append(text);
-            panel.Remove(); // start hidden
-            Append(panel);
-            return panel;
-        }
+        _btnPositions.OnLeftClick += (_, _) => Toggle(Subpanel.Positions);
+        _btnLayouts.OnLeftClick += (_, _) => Toggle(Subpanel.Layouts);
+        _btnSettings.OnLeftClick += (_, _) => Toggle(Subpanel.Settings);
 
-        private void TogglePositions(UIMouseEvent evt, UIElement listeningElement) => TogglePanel(positionsPanel);
-        private void ToggleLayouts(UIMouseEvent evt, UIElement listeningElement) => TogglePanel(layoutsPanel);
-        private void ToggleSettings(UIMouseEvent evt, UIElement listeningElement) => TogglePanel(settingsPanel);
+        Append(_btnPositions);
+        Append(_btnLayouts);
+        Append(_btnSettings);
 
-        private void TogglePanel(UIPanel panel)
-        {
-            // Hide all first
-            positionsPanel.Remove();
-            layoutsPanel.Remove();
-            settingsPanel.Remove();
+        _positions = new PositionsPanel();
+        _layouts = new LayoutsPanel();
+        _settings = new SettingsPanel();
+
+        _active = Subpanel.None;
+        CloseActive();
+    }
+
+    private void CloseActive()
+    {
+        _positions.Remove();
+        _layouts.Remove();
+        _settings.Remove();
+
+        _btnPositions.SetSelected(false);
+        _btnLayouts.SetSelected(false);
+        _btnSettings.SetSelected(false);
 
-            // Show selected
-            Append(panel);
+        _active = Subpanel.None;
+    }
+
+    private void Toggle(Subpanel target)
+    {
+        if (_active == target) { CloseActive(); return; }
+
+        _positions.Remove();
+        _layouts.Remove();
+        _settings.Remove();
+        _btnPositions.SetSelected(false);
+        _btnLayouts.SetSelected(false);
+        _btnSettings.SetSelected(false);
+
+        UIPanel panelToShow = null;
+        switch (target)
+        {
+            case Subpanel.Positions: panelToShow = _positions; _btnPositions.SetSelected(true); break;
+            case Subpanel.Layouts: panelToShow = _layouts; _btnLayouts.SetSelected(true); break;
+            case Subpanel.Settings: panelToShow = _settings; _btnSettings.SetSelected(true); break;
         }
 
-        public override void Draw(SpriteBatch spriteBatch)
+        if (panelToShow != null)
         {
             var sys = ModContent.GetInstance<EditSystem>();
-            if (!sys.Enabled) return;
+            sys.editState.Append(panelToShow);
 
-            base.Draw(spriteBatch);
+            Vector2 SubPanelPos = new(70, 600);
+            Vector2 SubPanelSize = new(285, 390);
+
+            panelToShow.Left.Set(SubPanelPos.X, 0f);
+            panelToShow.Top.Set(SubPanelPos.Y, 0f);
+            panelToShow.Width.Set(SubPanelSize.X, 0f);
+            panelToShow.Height.Set(SubPanelSize.Y, 0f);
+            _active = target;
         }
     }
-}
+
+    public override void LeftClick(UIMouseEvent evt)
+    {
+        var sys = ModContent.GetInstance<EditSystem>();
+        if (!sys.Enabled)
+            return;
+
+
+        base.LeftClick(evt);
+    }
+
+    public override void Draw(SpriteBatch spriteBatch)
+    {
+        var sys = ModContent.GetInstance<EditSystem>();
+        if (!sys.Enabled)
+            return;
+
+        base.Draw(spriteBatch);
+    }
+}

Edit/UI/EditPanel.cs

@@ -1,8 +1,10 @@
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
+using Terraria.GameContent;
 using Terraria.GameContent.UI.Elements;
 using Terraria.ID;
 using Terraria.ModLoader;
+using Terraria.UI;
 using UICustomizer.EditMode.System;
 
 namespace UICustomizer.EditMode.UI
@@ -15,10 +17,13 @@ public EditToggleButton() : base(Ass.EditorIcon)
             ImageScale = 1f;
             Top.Set(260, 0);
             Left.Set(Main.GameMode == GameModeID.Creative ? 65 : 30, 0);
+        }
 
-            // Click action
+        public override void LeftClick(UIMouseEvent evt)
+        {
+            base.LeftClick(evt);
             var sys = ModContent.GetInstance<EditSystem>();
-            OnLeftClick += (_, _) => sys.Toggle();
+            sys.Toggle();
         }
 
         public override void Draw(SpriteBatch sb)
@@ -27,7 +32,7 @@ public override void Draw(SpriteBatch sb)
 
             base.Draw(sb);
 
-            Rectangle r = new(76, 270, 28, 28);
+            Rectangle r = new(74, 268, 28, 28);
             //sb.Draw(TextureAssets.MagicPixel.Value, r, Color.White*0.5f); 
             bool hover = r.Contains(Main.MouseScreen.ToPoint());
 

Edit/UI/EditToggleButton.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Reflection;
+using Microsoft.Xna.Framework.Graphics;
+using ReLogic.Content;
+using Terraria;
+using Terraria.GameContent.UI.Elements;
+
+namespace UICustomizer.Edit.UI
+{
+    internal class IconOptionButton : UIColoredImageButton
+    {
+        private string name;
+
+        public IconOptionButton(Asset<Texture2D> texture, string name, int index) : base(texture, isSmall: false)
+        {
+            this.name = name;
+            Width.Set(40, 0);
+            Height.Set(40, 0);
+            HAlign = 0.5f;
+
+            Top.Set(46 * index+6,0);
+        }
+
+        public override void Draw(SpriteBatch spriteBatch)
+        {
+            _backPanelTexture = Ass.DarkPanel;
+            base.Draw(spriteBatch);
+
+            if (IsMouseHovering)
+            {
+                Main.hoverItemName = $"{name}";
+            }
+        }
+    }
+}

Edit/UI/IconOptionButton.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Terraria.GameContent.UI.Elements;
+using Terraria.ModLoader.UI;
+using Terraria.UI;
+using UICustomizer.EditMode.Helpers;
+
+namespace UICustomizer.Edit.UI; 
+internal sealed class LayoutsPanel : UIPanel
+{
+    public LayoutsPanel()
+    {
+        BorderColor = new Color(89, 116, 213) * 0.9f;
+        BackgroundColor = new Color(73, 94, 171) * 0.9f;
+
+        Width.Set(360, 0);
+        Height.Set(260, 0);
+        Left.Set(70, 0);
+        Top.Set(0, 0);
+        SetPadding(8);
+
+        Build();
+    }
+
+    private void Build()
+    {
+        RemoveAllChildren();
+
+        float y = 4;
+
+        // Active layout
+        Append(MakeButton("Use Active", "Switch to Active layout", () =>
+        {
+            TryCall(() => LayoutHelper.ApplyLayout("Active"));
+            TryCall(() => LayoutHelper.CurrentLayoutName = "Active");
+            TryCall(() => LayoutHelper.SaveLastLayout());
+        }, y));
+        y += 28;
+
+        // Presets
+        Append(new UIText("Presets", 0.9f) { Top = { Pixels = y }, Left = { Pixels = 6 } });
+        y += 20;
+
+        var names = TryGetLayouts() ?? new List<string>();
+        foreach (var name in names.Where(n => !string.Equals(n, "Active", StringComparison.OrdinalIgnoreCase)))
+        {
+            Append(MakeButton(name, "Apply this layout", () =>
+            {
+                TryCall(() => LayoutHelper.ApplyLayout(name));
+                TryCall(() => LayoutHelper.CurrentLayoutName = name);
+                TryCall(() => LayoutHelper.SaveLastLayout());
+            }, y));
+
+            y += 26;
+        }
+
+        y += 6;
+        Append(new UIText("Options", 0.9f) { Top = { Pixels = y }, Left = { Pixels = 6 } });
+        y += 20;
+
+        Append(MakeButton("Open layout folder", "Open layout folder", () => TryCall(FileHelper.OpenLayoutFolder), y)); y += 26;
+        Append(MakeButton("Save as new layout", "Create a new layout file", () => TryCall(() => FileHelper.CreateAndOpenNewLayoutFile("MyCustomLayout")), y)); y += 26;
+        Append(MakeButton("Remove all layouts", "Delete all layouts", () => TryCall(FileHelper.DeleteAllLayouts), y)); y += 26;
+    }
+
+    private UIElement MakeButton(string text, string tip, Action onClick, float y)
+    {
+        var btn = new UIPanel
+        {
+            Width = { Percent = 1f, Pixels = -12 },
+            Height = { Pixels = 22 },
+            Top = { Pixels = y },
+            Left = { Pixels = 6 },
+            BackgroundColor = new Color(60, 80, 150) * 0.9f,
+            BorderColor = new Color(40, 55, 110)
+        };
+        btn.SetPadding(0);
+        btn.Append(new UIText(text, 0.85f) { HAlign = 0.5f, VAlign = 0.5f });
+        btn.OnLeftClick += (_, _) => onClick();
+        btn.OnMouseOver += (_, _) =>
+        {
+            UICommon.TooltipMouseText(tip);
+            btn.BackgroundColor = new Color(80, 100, 170) * 0.95f;
+        };
+        btn.OnMouseOut += (_, _) => btn.BackgroundColor = new Color(60, 80, 150) * 0.9f;
+        return btn;
+    }
+
+    private static void TryCall(Action a)
+    {
+        try { a?.Invoke(); } catch { /* no-op if helpers not present */ }
+    }
+    private static List<string> TryGetLayouts()
+    {
+        try { return FileHelper.GetLayouts().ToList(); } catch { return null; }
+    }
+}