From e68fa6d665e99c86c6a66ab7ec077269966903d0 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:00:34 -0400 Subject: [PATCH 01/26] All base colors replaced --- Prowl.Editor/EditorApplication.cs | 8 ++--- Prowl.Editor/EditorTheme.cs | 30 +++++++++---------- Prowl.Editor/Inspector/AddComponentPopup.cs | 8 ++--- .../Inspector/EngineObjectPropertyEditor.cs | 10 +++---- Prowl.Editor/MainMenuBar.cs | 8 ++--- Prowl.Editor/Panels/HierarchyPanel.cs | 2 +- Prowl.Editor/Panels/PreferencesPanel.cs | 4 +-- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 4 +-- Prowl.Editor/Panels/SceneViewPanel.cs | 2 +- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 4 +-- Prowl.Editor/Widgets/ColorPicker.cs | 14 ++++----- Prowl.Editor/Widgets/CurveEditor.cs | 8 ++--- Prowl.Editor/Widgets/EditorGUI.cs | 16 +++++----- Prowl.Editor/Widgets/FileDialog.cs | 14 ++++----- Prowl.Editor/Widgets/ModalDialog.cs | 4 +-- Prowl.Editor/Widgets/Tooltip.cs | 2 +- 16 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Prowl.Editor/EditorApplication.cs b/Prowl.Editor/EditorApplication.cs index 447a35cc..7e347c11 100644 --- a/Prowl.Editor/EditorApplication.cs +++ b/Prowl.Editor/EditorApplication.cs @@ -289,7 +289,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) float bl = cx - botW / 2f; float br = cx + botW / 2f; - var nc = EditorTheme.Normal; + var nc = EditorTheme.Neutral300; var flapColor = Prowl.Vector.Color32.FromArgb(nc.A, nc.R, nc.G, nc.B); float r = rad; @@ -314,7 +314,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) canvas.FillComplexAA(); // Outline (sides + bottom only) - var bc = EditorTheme.Bright; + var bc = EditorTheme.Ink200; canvas.SetStrokeColor(Prowl.Vector.Color32.FromArgb(bc.A, bc.R, bc.G, bc.B)); canvas.SetStrokeWidth(1f); canvas.BeginPath(); @@ -351,7 +351,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .PositionType(PositionType.SelfDirected) .Position(bx, flapContentY + 4).Size(1, EditorTheme.MenuBarHeight - 8) .IsNotInteractable() - .BackgroundColor(EditorTheme.Border); + .BackgroundColor(EditorTheme.Ink200); bx += 10f; @@ -397,7 +397,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .PositionType(PositionType.SelfDirected) .Position(bx, flapContentY + 4).Size(1, EditorTheme.MenuBarHeight - 8) .IsNotInteractable() - .BackgroundColor(EditorTheme.Border); + .BackgroundColor(EditorTheme.Ink200); bx += 10f; diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index 79b35df1..1e3a060b 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -32,19 +32,19 @@ public static class EditorTheme #region Outdated // 4-shade system: Darkest → Dark → Normal → Bright - public static Color Background = Color.FromArgb(255, 10, 10, 12);// Background (near black) - public static Color Darkest = Color.FromArgb(255, 20, 20, 22); // Menu bar - public static Color Dark = Color.FromArgb(255, 28, 28, 30); // Background (near black) - public static Color Normal = Color.FromArgb(255, 37, 37, 40); // Windows/panels - public static Color Bright = Color.FromArgb(255, 65, 65, 70); // Scrollbar, outline + // public static Color Background = Color.FromArgb(255, 10, 10, 12);// Background (near black) + // public static Color Darkest = Color.FromArgb(255, 20, 20, 22); // Menu bar + // public static Color Dark = Color.FromArgb(255, 28, 28, 30); // Background (near black) + // public static Color Normal = Color.FromArgb(255, 37, 37, 40); // Windows/panels + // public static Color Bright = Color.FromArgb(255, 65, 65, 70); // Scrollbar, outline // Aliases for readability - public static Color MenuBarBackground => Darkest; - public static Color WindowBackground => Normal; - public static Color PanelBackground => Normal; + // public static Color MenuBarBackground => Darkest; + // public static Color WindowBackground => Normal; + // public static Color PanelBackground => Normal; public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); - public static Color Border => Bright; + // public static Color Border => Bright; // Text public static Color Text = Color.FromArgb(255, 220, 220, 220); @@ -61,16 +61,16 @@ public static class EditorTheme public static Color AccentDim = Color.FromArgb(255, 40, 90, 140); // Borders - public static Color BorderFocused = Color.FromArgb(255, 51, 122, 183); + // public static Color BorderFocused = Color.FromArgb(255, 51, 122, 183); // Splitter - public static Color Splitter = Color.FromArgb(255, 25, 25, 25); - public static Color SplitterHovered = Color.FromArgb(255, 51, 122, 183); + // public static Color Splitter = Color.FromArgb(255, 25, 25, 25); + // public static Color SplitterHovered = Color.FromArgb(255, 51, 122, 183); // Tab - public static Color TabActive => Normal; - public static Color TabInactive => Darkest; - public static Color TabHovered = Color.FromArgb(255, 55, 55, 58); + // public static Color TabActive => Normal; + // public static Color TabInactive => Darkest; + // public static Color TabHovered = Color.FromArgb(255, 55, 55, 58); #endregion diff --git a/Prowl.Editor/Inspector/AddComponentPopup.cs b/Prowl.Editor/Inspector/AddComponentPopup.cs index 5418880f..3ae2d41e 100644 --- a/Prowl.Editor/Inspector/AddComponentPopup.cs +++ b/Prowl.Editor/Inspector/AddComponentPopup.cs @@ -66,15 +66,15 @@ public static void Draw(Paper paper) using (paper.Column("acp_modal") .Size(320, 450) .Margin(UnitValue.StretchOne) - .BackgroundColor(EditorTheme.Normal) - .BorderColor(EditorTheme.Bright).BorderWidth(1).Rounded(8) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1).Rounded(8) .Layer(Layer.Overlay) .Enter()) { // Header using (paper.Row("acp_header") .Height(32).ChildLeft(12).ChildRight(8).RowBetween(8) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .Enter()) { paper.Box("acp_title").Height(32) @@ -157,7 +157,7 @@ public static void Draw(Paper paper) // Small separator paper.Box($"acp_sep_{category.GetHashCode()}") .Height(1).Margin(8, 3, 8, 3) - .BackgroundColor(EditorTheme.Border); + .BackgroundColor(EditorTheme.Ink200); } } } diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 583fb0dd..0b0e9996 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -57,7 +57,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .BackgroundColor(isDragTarget ? System.Drawing.Color.FromArgb(60, EditorTheme.Accent) : EditorTheme.InputBackground) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3).ChildLeft(4).ChildRight(2).RowBetween(2) - .BorderColor(isDragTarget ? EditorTheme.Accent : EditorTheme.Border).BorderWidth(1) + .BorderColor(isDragTarget ? EditorTheme.Accent : EditorTheme.Ink200).BorderWidth(1) .OnDoubleClick((fieldType, onChange), (cap, _) => OpenSelector(cap.Item1, cap.Item2)); using (fieldEl.Enter()) @@ -149,15 +149,15 @@ public static void DrawSelectorModal(Paper paper) using (paper.Column("eo_sel_modal") .Size(350, 400) .Margin(UnitValue.StretchOne) - .BackgroundColor(EditorTheme.Normal) - .BorderColor(EditorTheme.Bright).BorderWidth(1).Rounded(8) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1).Rounded(8) .Layer(Layer.Overlay) .Enter()) { // Header using (paper.Row("eo_sel_header") .Height(32).ChildLeft(12).ChildRight(8).RowBetween(8) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .Enter()) { paper.Box("eo_sel_title").Height(32) @@ -215,7 +215,7 @@ public static void DrawSelectorModal(Paper paper) if (projectItems.Count > 0) { if (builtInItems.Count > 0) - paper.Box("eo_sel_sep2").Height(1).Margin(4, 2, 4, 2).BackgroundColor(EditorTheme.Border); + paper.Box("eo_sel_sep2").Height(1).Margin(4, 2, 4, 2).BackgroundColor(EditorTheme.Ink200); paper.Box("eo_sel_proj_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.FolderOpen} Project", font) diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index fa99ac84..628ac58a 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -21,7 +21,7 @@ public static void Draw(Paper paper) .PositionType(PositionType.SelfDirected) .Position(0, 0) .Size(paper.Percent(100), EditorTheme.MenuBarHeight) - .BackgroundColor(EditorTheme.MenuBarBackground) + .BackgroundColor(EditorTheme.Neutral200) .ChildLeft(10) .RowBetween(10) .Enter()) @@ -62,8 +62,8 @@ private static void RenderDropdown(Paper paper, string id, List items, .Position(x, y) .Width(DropdownWidth) .Height(UnitValue.Auto) - .BackgroundColor(EditorTheme.PanelBackground) - .BorderColor(EditorTheme.Border) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200) .BorderWidth(1) .Rounded(4) .ChildTop(2).ChildBottom(2) @@ -81,7 +81,7 @@ private static void RenderDropdown(Paper paper, string id, List items, paper.Box($"{id}_sep_{index}") .Height(1) .Margin(4, 4, 4, 4) - .BackgroundColor(EditorTheme.Border); + .BackgroundColor(EditorTheme.Ink200); continue; } diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index 790290f1..b19e96b4 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -74,7 +74,7 @@ public override void OnGUI(Paper paper, float width, float height) // Scene name header paper.Box("hier_scene_name") .Height(22).ChildLeft(8) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .Text($"{EditorIcons.Film} {scene.Name}", font) .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 1) diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index ec4528e4..52230656 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -31,7 +31,7 @@ public override void OnGUI(Paper paper, float width, float height) float sideW = 160f; using (paper.Column("pref_sidebar") .Width(sideW).Height(height) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .Enter()) { paper.Box("pref_sidebar_hdr") @@ -45,7 +45,7 @@ public override void OnGUI(Paper paper, float width, float height) DrawTabBtn(paper, font, "Theme", EditorIcons.Palette, Tab.Theme); } - paper.Box("pref_div").Width(1).Height(height).BackgroundColor(EditorTheme.Border); + paper.Box("pref_div").Width(1).Height(height).BackgroundColor(EditorTheme.Ink200); float contentW = width - sideW - 1; using (ScrollView.Begin(paper, "pref_content", contentW, height)) diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index df174c04..b5fbf62d 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -39,7 +39,7 @@ public override void OnGUI(Paper paper, float width, float height) float sidebarW = 180f; using (paper.Column("ps_sidebar") .Width(sidebarW).Height(height) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .Enter()) { paper.Box("ps_sidebar_header") @@ -69,7 +69,7 @@ public override void OnGUI(Paper paper, float width, float height) } // Separator - paper.Box("ps_divider").Width(1).Height(height).BackgroundColor(EditorTheme.Border); + paper.Box("ps_divider").Width(1).Height(height).BackgroundColor(EditorTheme.Ink200); // Right content — selected settings float contentW = width - sidebarW - 1; diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index 91d136d4..887fd939 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -91,7 +91,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Universal)); - paper.Box("sv_sep_1").Width(1).Height(18).BackgroundColor(EditorTheme.Border); + paper.Box("sv_sep_1").Width(1).Height(18).BackgroundColor(EditorTheme.Ink200); // Grid toggle bool showGrid = _editorCamera?.ShowGrid ?? true; diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index 2684bde7..5ba3582f 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -332,7 +332,7 @@ public override void OnGUI(Paper paper, float width, float height) .Height(60) .BackgroundColor(EditorTheme.InputBackground) .Rounded(6) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .ChildLeft(16).ChildTop(8) .Enter()) { @@ -403,7 +403,7 @@ public override void OnGUI(Paper paper, float width, float height) .BackgroundColor(EditorTheme.ButtonNormal) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Tooltip("This is a tooltip! It appears after a short hover delay."); if (EditorTheme.DefaultFont != null) tooltipBtn.Text("Hover me for tooltip", EditorTheme.DefaultFont) diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index 11365f95..37e8f021 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -26,8 +26,8 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action using (paper.Column(id) .Width(280) .Height(UnitValue.Auto) - .BackgroundColor(EditorTheme.PanelBackground) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Rounded(6) .ChildLeft(8).ChildRight(8).ChildTop(8).ChildBottom(8) .RowBetween(6) @@ -58,10 +58,10 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action // === Preview === using (paper.Row($"{id}_prev").Height(24).RowBetween(6).Enter()) { - paper.Box($"{id}_old").Size(40, 24).Rounded(3).BorderColor(EditorTheme.Border).BorderWidth(1) + paper.Box($"{id}_old").Size(40, 24).Rounded(3).BorderColor(EditorTheme.Ink200).BorderWidth(1) .BackgroundColor(SysColor.FromArgb((int)(value.A*255),(int)(value.R*255),(int)(value.G*255),(int)(value.B*255))); var nc = HSVToColor(h, s, v, a); - paper.Box($"{id}_new").Size(40, 24).Rounded(3).BorderColor(EditorTheme.Border).BorderWidth(1) + paper.Box($"{id}_new").Size(40, 24).Rounded(3).BorderColor(EditorTheme.Ink200).BorderWidth(1) .BackgroundColor(SysColor.FromArgb((int)(nc.A*255),(int)(nc.R*255),(int)(nc.G*255),(int)(nc.B*255))); if (font != null) { @@ -95,7 +95,7 @@ static void DrawPalette(Paper paper, string id, ElementHandle el, FontFile? font if (palette == null || palette.Count == 0) return; // Separator - paper.Box($"{id}_sep").Height(1).BackgroundColor(EditorTheme.Border); + paper.Box($"{id}_sep").Height(1).BackgroundColor(EditorTheme.Ink200); // Palette grid — laid out as rows of swatches const float swatchSize = 16f; @@ -124,7 +124,7 @@ static void DrawPalette(Paper paper, string id, ElementHandle el, FontFile? font .Size(swatchSize, swatchSize) .BackgroundColor(sc) .Rounded(2) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() .OnClick(idx, (ci, _) => { @@ -146,7 +146,7 @@ static void DrawPalette(Paper paper, string id, ElementHandle el, FontFile? font .Size(swatchSize, swatchSize) .BackgroundColor(EditorTheme.ButtonNormal) .Rounded(2) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .OnPostLayout((handle, rect) => paper.Draw(ref handle, (canvas, r) => { diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index a3f5b6f4..0d34e421 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -38,7 +38,7 @@ public static WidgetResult CurveField(Paper paper, string id, st using (paper.Box($"{id}_preview") .Height(40).Width(UnitValue.Stretch()) .BackgroundColor(EditorTheme.InputBackground) - .Rounded(3).BorderColor(EditorTheme.Border).BorderWidth(1) + .Rounded(3).BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() .Enter()) { @@ -105,8 +105,8 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< using (paper.Column(id) .Size(editorW, editorH) - .BackgroundColor(EditorTheme.PanelBackground) - .BorderColor(EditorTheme.Border).BorderWidth(1).Rounded(6) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1).Rounded(6) .Layer(Layer.Topmost) .ClampToScreen() .Enter()) @@ -384,7 +384,7 @@ static void DrawCurvePalette(Paper paper, string id, AnimationCurve curve, .Size(presetW, presetH) .BackgroundColor(EditorTheme.InputBackground) .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() .Tooltip(preset.Name) .OnClick(idx, (ci, _) => diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index c691084f..2921abbe 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -108,7 +108,7 @@ public static WidgetResult Button(Paper paper, string id, string label, fl .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .OnClick(e => userCallback?.Invoke(true)); if (width > 0) el.Width(width); @@ -140,7 +140,7 @@ public static WidgetResult ButtonSquare(Paper paper, string id, string ico .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .OnClick(e => userCallback?.Invoke(true)); return new WidgetResult(cb => userCallback = cb); @@ -168,7 +168,7 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo .Hovered.BackgroundColor(value ? EditorTheme.AccentDim : EditorTheme.ButtonHovered).End() .Rounded(3) .Alignment(PaperUI.TextAlignment.MiddleCenter) - .BorderColor(EditorTheme.Border).BorderWidth(1); + .BorderColor(EditorTheme.Ink200).BorderWidth(1); if (value && Font != null) box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Text).FontSize(12f); @@ -510,7 +510,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .Width(UnitValue.Stretch()) .BackgroundColor(EditorTheme.Neutral200) .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() .ChildLeft(6).ChildRight(6) .OnClick(e => @@ -572,8 +572,8 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .Position(0, EditorTheme.RowHeight - 1) .Width(UnitValue.Stretch()) .Height(UnitValue.Auto) - .BackgroundColor(EditorTheme.PanelBackground) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Rounded(4) .ChildTop(2).ChildBottom(2).ChildLeft(2).ChildRight(2) .HookToParent() @@ -625,7 +625,7 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab .Hovered.BackgroundColor(value ? EditorTheme.AccentDim : EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .OnClick(e => userCallback?.Invoke(!value)).Enter()) { if (Font != null) @@ -869,7 +869,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, (int)(value.G * 255), (int)(value.B * 255))) .Rounded(3) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() .Enter()) { diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 715c1402..8b105a79 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -254,8 +254,8 @@ public static void Draw(Paper paper) using (paper.Column("fd_window") .Size(DialogWidth, DialogHeight) .Margin(UnitValue.StretchOne) - .BackgroundColor(EditorTheme.Normal) - .BorderColor(EditorTheme.Bright).BorderWidth(1).Rounded(8) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1).Rounded(8) .Layer(Layer.Overlay) .Enter()) { @@ -269,7 +269,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) { using (paper.Row("fd_toolbar") .Height(ToolbarHeight) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .ChildLeft(6).ChildRight(6).RowBetween(4) .Enter()) { @@ -347,7 +347,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) { using (paper.Column("fd_sidebar") .Width(SidebarWidth) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .ChildTop(8).ChildLeft(4).ChildRight(4).ColBetween(2) .Enter()) { @@ -373,7 +373,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) // Separator paper.Box("fd_qa_sep").Height(1).Margin(4, 8, 4, 8) - .BackgroundColor(EditorTheme.Border); + .BackgroundColor(EditorTheme.Ink200); // Drives paper.Box("fd_drv_label").Height(20) @@ -406,7 +406,7 @@ private static void DrawColumnHeaders(Paper paper, Prowl.Scribe.FontFile font) { using (paper.Row("fd_headers") .Height(HeaderHeight) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .ChildLeft(4).RowBetween(0) .Enter()) { @@ -548,7 +548,7 @@ private static void DrawBottomBar(Paper paper, Prowl.Scribe.FontFile font) { using (paper.Column("fd_bottom") .Height(BottomBarHeight) - .BackgroundColor(EditorTheme.Darkest) + .BackgroundColor(EditorTheme.Neutral200) .ChildLeft(8).ChildRight(8).ChildTop(6).ChildBottom(6).ColBetween(6) .Enter()) { diff --git a/Prowl.Editor/Widgets/ModalDialog.cs b/Prowl.Editor/Widgets/ModalDialog.cs index 8e666302..39af96c0 100644 --- a/Prowl.Editor/Widgets/ModalDialog.cs +++ b/Prowl.Editor/Widgets/ModalDialog.cs @@ -112,8 +112,8 @@ public static void Draw(Paper paper) dialogBuilder.Height(UnitValue.Auto); using (dialogBuilder - .BackgroundColor(EditorTheme.PanelBackground) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Rounded(8) .BoxShadow(0, 4, 20, 0, Color.FromArgb(80, 0, 0, 0)) .Layer(Layer.Overlay) diff --git a/Prowl.Editor/Widgets/Tooltip.cs b/Prowl.Editor/Widgets/Tooltip.cs index ef9499ff..8e891ae3 100644 --- a/Prowl.Editor/Widgets/Tooltip.cs +++ b/Prowl.Editor/Widgets/Tooltip.cs @@ -67,7 +67,7 @@ public static void Draw(Paper paper) .Height(UnitValue.Auto) .Width(UnitValue.Auto) .BackgroundColor(Color.FromArgb(230, 40, 40, 43)) - .BorderColor(EditorTheme.Border).BorderWidth(1) + .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Rounded(4) .ChildLeft(8).ChildRight(8).ChildTop(4).ChildBottom(4) .Layer(Layer.Topmost) From c1ed272239d2767133c9cf73390f3ea14148c5a5 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:03:46 -0400 Subject: [PATCH 02/26] Replace EditorTheme.HeaderBackground with EditorTheme.Neutral300 --- Prowl.Editor/Inspector/GameObjectInspector.cs | 2 +- Prowl.Editor/Widgets/EditorGUI.cs | 2 +- Prowl.Editor/Widgets/ModalDialog.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index f74268fe..f61df54b 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -136,7 +136,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game // Component foldout header using (paper.Row($"{compId}_header") .Height(24) - .BackgroundColor(EditorTheme.HeaderBackground) + .BackgroundColor(EditorTheme.Neutral300) .Rounded(3) .ChildLeft(4) .RowBetween(4) diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index 2921abbe..646d997b 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -435,7 +435,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .Row($"{id}_header") .Height(EditorTheme.RowHeight) .ChildLeft(4) - .BackgroundColor(EditorTheme.HeaderBackground) + .BackgroundColor(EditorTheme.Neutral300) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(2); diff --git a/Prowl.Editor/Widgets/ModalDialog.cs b/Prowl.Editor/Widgets/ModalDialog.cs index 39af96c0..d907013a 100644 --- a/Prowl.Editor/Widgets/ModalDialog.cs +++ b/Prowl.Editor/Widgets/ModalDialog.cs @@ -124,7 +124,7 @@ public static void Draw(Paper paper) { paper.Box("modal_title") .Height(32) - .BackgroundColor(EditorTheme.HeaderBackground) + .BackgroundColor(EditorTheme.Neutral300) .Rounded(8) .ChildLeft(12) .Text(modal.Title, font) From 9d3b36daaf1a5817e95bb26eaf513643934be0bb Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:08:24 -0400 Subject: [PATCH 03/26] Replace EditorTheme.InputBackground with EditorTheme.Neutral300 --- Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs | 2 +- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 2 +- Prowl.Editor/Widgets/ColorPicker.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 4 ++-- Prowl.Editor/Widgets/EditorGUI.cs | 2 +- Prowl.Editor/Widgets/FileDialog.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 0b0e9996..2d81cafa 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -54,7 +54,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, // Object field row var fieldEl = paper.Row($"{id}_field") .Height(EditorTheme.RowHeight) - .BackgroundColor(isDragTarget ? System.Drawing.Color.FromArgb(60, EditorTheme.Accent) : EditorTheme.InputBackground) + .BackgroundColor(isDragTarget ? System.Drawing.Color.FromArgb(60, EditorTheme.Accent) : EditorTheme.Neutral300) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3).ChildLeft(4).ChildRight(2).RowBetween(2) .BorderColor(isDragTarget ? EditorTheme.Accent : EditorTheme.Ink200).BorderWidth(1) diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index 5ba3582f..8af4e2b8 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -330,7 +330,7 @@ public override void OnGUI(Paper paper, float width, float height) using (paper.Box("ctx_demo_area") .Height(60) - .BackgroundColor(EditorTheme.InputBackground) + .BackgroundColor(EditorTheme.Neutral300) .Rounded(6) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .ChildLeft(16).ChildTop(8) diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index 37e8f021..ca890fac 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -271,7 +271,7 @@ static void ChannelSlider(Paper paper, string id, string label, float value, Sys { if (font != null) paper.Box($"{id}_l").Width(14).IsNotInteractable().Text(label, font).TextColor(labelColor).FontSize(fontSize); paper.Box($"{id}_t").Height(SliderHeight).Width(UnitValue.Stretch()) - .BackgroundColor(EditorTheme.InputBackground).Rounded(2) + .BackgroundColor(EditorTheme.Neutral300).Rounded(2) .OnClick(e => onChange(Math.Clamp((float)e.NormalizedPosition.X, 0, 1))) .OnDragging(e => onChange(Math.Clamp((float)e.NormalizedPosition.X, 0, 1))) .OnPostLayout((handle, rect) => paper.Draw(ref handle, (canvas, r) => diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index 0d34e421..c89b5807 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -37,7 +37,7 @@ public static WidgetResult CurveField(Paper paper, string id, st using (paper.Box($"{id}_preview") .Height(40).Width(UnitValue.Stretch()) - .BackgroundColor(EditorTheme.InputBackground) + .BackgroundColor(EditorTheme.Neutral300) .Rounded(3).BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() .Enter()) @@ -382,7 +382,7 @@ static void DrawCurvePalette(Paper paper, string id, AnimationCurve curve, using (paper.Box($"{id}_p{idx}") .Size(presetW, presetH) - .BackgroundColor(EditorTheme.InputBackground) + .BackgroundColor(EditorTheme.Neutral300) .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BorderColor(EditorTheme.Accent).End() diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index 646d997b..d7befa6b 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -164,7 +164,7 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo { var box = paper.Box($"{id}_box") .Size(16, 16) - .BackgroundColor(value ? EditorTheme.Accent : EditorTheme.InputBackground) + .BackgroundColor(value ? EditorTheme.Accent : EditorTheme.Neutral300) .Hovered.BackgroundColor(value ? EditorTheme.AccentDim : EditorTheme.ButtonHovered).End() .Rounded(3) .Alignment(PaperUI.TextAlignment.MiddleCenter) diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 8b105a79..61e6898c 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -304,7 +304,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) // Breadcrumb path paper.Box("fd_path") .Height(ToolbarHeight) - .BackgroundColor(EditorTheme.InputBackground) + .BackgroundColor(EditorTheme.Neutral300) .Rounded(4) .ChildLeft(8) .Text(_currentPath, font).TextColor(EditorTheme.Text) From 22f06acfe282cf8f2f07a1b2f58824acddb56b23 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:09:18 -0400 Subject: [PATCH 04/26] Replace EditorTheme.Text with EditorTheme.Ink500 --- Prowl.Editor/DragDrop.cs | 2 +- Prowl.Editor/EditorApplication.cs | 12 ++-- Prowl.Editor/EditorTheme.cs | 10 +-- Prowl.Editor/Inspector/AddComponentPopup.cs | 12 ++-- .../Inspector/EngineObjectPropertyEditor.cs | 26 +++---- Prowl.Editor/Inspector/GameObjectInspector.cs | 10 +-- Prowl.Editor/MainMenuBar.cs | 4 +- Prowl.Editor/Panels/GameViewPanel.cs | 4 +- Prowl.Editor/Panels/HierarchyPanel.cs | 16 ++--- Prowl.Editor/Panels/InspectorPanel.cs | 12 ++-- Prowl.Editor/Panels/PreferencesPanel.cs | 4 +- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 6 +- Prowl.Editor/Panels/SceneViewPanel.cs | 14 ++-- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 6 +- .../Settings/TagsAndLayersSettings.cs | 8 +-- Prowl.Editor/Widgets/ColorPicker.cs | 6 +- Prowl.Editor/Widgets/ContextMenuBuilder.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 6 +- Prowl.Editor/Widgets/EditorGUI.cs | 70 +++++++++---------- Prowl.Editor/Widgets/FileDialog.cs | 34 ++++----- Prowl.Editor/Widgets/ModalDialog.cs | 2 +- Prowl.Editor/Widgets/PropertyGrid.cs | 6 +- Prowl.Editor/Widgets/Tooltip.cs | 2 +- 23 files changed, 137 insertions(+), 137 deletions(-) diff --git a/Prowl.Editor/DragDrop.cs b/Prowl.Editor/DragDrop.cs index b84f7774..03dc6494 100644 --- a/Prowl.Editor/DragDrop.cs +++ b/Prowl.Editor/DragDrop.cs @@ -139,7 +139,7 @@ public static void DrawVisual(Paper paper) .IsNotInteractable() .Layer(Layer.Topmost) .Text($"{Payload.Icon} {Payload.DisplayName}", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/EditorApplication.cs b/Prowl.Editor/EditorApplication.cs index 7e347c11..eb0c0c5e 100644 --- a/Prowl.Editor/EditorApplication.cs +++ b/Prowl.Editor/EditorApplication.cs @@ -248,7 +248,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(w - 130, 0).Size(120, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text($"Prowl v{version}", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); @@ -340,7 +340,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(bx, flapContentY).Size(projW, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text(projectText, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); @@ -362,7 +362,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(Application.IsPlaying ? System.Drawing.Color.FromArgb(255, 60, 160, 60) : System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.Play, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.Play, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, e) => Application.IsPlaying = !Application.IsPlaying); @@ -375,7 +375,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.Pause, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.Pause, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter); bx += btnSize + 4f; @@ -387,7 +387,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter); bx += btnSize + 8f; @@ -407,7 +407,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(bx, flapContentY).Size(fpsW, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text(fpsText, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); } diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index 1e3a060b..8da2b005 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -42,14 +42,14 @@ public static class EditorTheme // public static Color MenuBarBackground => Darkest; // public static Color WindowBackground => Normal; // public static Color PanelBackground => Normal; - public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); - public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); + // public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); + // public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); // public static Color Border => Bright; // Text - public static Color Text = Color.FromArgb(255, 220, 220, 220); - public static Color TextDim = Color.FromArgb(255, 150, 150, 150); - public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); + // public static Color Text = Color.FromArgb(255, 220, 220, 220); + // public static Color TextDim = Color.FromArgb(255, 150, 150, 150); + // public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); // Interactive public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); diff --git a/Prowl.Editor/Inspector/AddComponentPopup.cs b/Prowl.Editor/Inspector/AddComponentPopup.cs index 3ae2d41e..cf2f2a1f 100644 --- a/Prowl.Editor/Inspector/AddComponentPopup.cs +++ b/Prowl.Editor/Inspector/AddComponentPopup.cs @@ -79,7 +79,7 @@ public static void Draw(Paper paper) { paper.Box("acp_title").Height(32) .Text("Add Component", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box("acp_spacer"); @@ -87,7 +87,7 @@ public static void Draw(Paper paper) paper.Box("acp_close") .Width(24).Height(24).Rounded(4) .Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => Close()); } @@ -120,7 +120,7 @@ public static void Draw(Paper paper) { paper.Box("acp_empty").Height(40) .Text("No matching components", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); } @@ -146,7 +146,7 @@ public static void Draw(Paper paper) paper.Box($"acp_cat_{category.GetHashCode()}") .Height(20).ChildLeft(8) .Text(category, font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft); foreach (var comp in group.OrderBy(c => c.Name)) @@ -183,13 +183,13 @@ private static void DrawComponentItem(Paper paper, Prowl.Scribe.FontFile font, s // Icon paper.Box($"{id}_ico") .Width(16).Height(EditorTheme.RowHeight) - .Text(comp.Icon, font).TextColor(EditorTheme.TextDim) + .Text(comp.Icon, font).TextColor(EditorTheme.Ink500Dim) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); // Name paper.Box($"{id}_name") .Height(EditorTheme.RowHeight) - .Text(comp.Name, font).TextColor(EditorTheme.Text) + .Text(comp.Name, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); } } diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 2d81cafa..8bc5df62 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, if (!string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(EditorTheme.LabelWidth).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, font).TextColor(EditorTheme.Text) + .Text(label, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Check if a compatible asset is being dragged over this field @@ -86,7 +86,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Width(16).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text(icon, font) - .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.TextDisabled) + .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.Ink500Disabled) .FontSize(10f).Alignment(TextAlignment.MiddleCenter); // Name @@ -94,13 +94,13 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Height(EditorTheme.RowHeight).Clip() .IsNotInteractable() .Text(displayName, font) - .TextColor(eo != null ? EditorTheme.Text : EditorTheme.TextDisabled) + .TextColor(eo != null ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); // Picker circle button paper.Box($"{id}_pick") .Width(20).Height(EditorTheme.RowHeight) - .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.Ink500Dim) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.Accent).End() .Rounded(3) @@ -162,7 +162,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_title").Height(32) .Text($"Select {_selectorType.Name}", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box("eo_sel_spacer"); @@ -170,7 +170,7 @@ public static void DrawSelectorModal(Paper paper) paper.Box("eo_sel_close") .Width(24).Height(24).Rounded(4) .Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => _selectorOpen = false); } @@ -184,7 +184,7 @@ public static void DrawSelectorModal(Paper paper) .Hovered.BackgroundColor(EditorTheme.Accent).End() .Rounded(3) .Text("None", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft) .OnClick(0, (_, _) => { @@ -201,7 +201,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_bi_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.Cube} Built-In", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); for (int i = 0; i < builtInItems.Count; i++) @@ -219,7 +219,7 @@ public static void DrawSelectorModal(Paper paper) paper.Box("eo_sel_proj_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.FolderOpen} Project", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); for (int i = 0; i < projectItems.Count; i++) @@ -234,7 +234,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_empty").Height(40) .Text("No assets of this type found", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); } } @@ -257,17 +257,17 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st { paper.Box($"{id}_ico") .Width(14).Height(EditorTheme.RowHeight) - .Text(icon, font).TextColor(EditorTheme.TextDim) + .Text(icon, font).TextColor(EditorTheme.Ink500Dim) .FontSize(9f).Alignment(TextAlignment.MiddleCenter); paper.Box($"{id}_name") .Height(EditorTheme.RowHeight).Clip() - .Text(name, font).TextColor(EditorTheme.Text) + .Text(name, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box($"{id}_path") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildRight(4) - .Text($"({pathLabel})", font).TextColor(EditorTheme.TextDisabled) + .Text($"({pathLabel})", font).TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight); } } diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index f61df54b..46cf2eae 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -61,14 +61,14 @@ private static void DrawHeader(Paper paper, Prowl.Scribe.FontFile font, GameObje .Enter()) { paper.Box("gi_tag_lbl").Width(30).Height(22) - .Text("Tag", font).TextColor(EditorTheme.TextDim) + .Text("Tag", font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "gi_tag", "", go.Tag) .OnValueChanged(v => go.Tag = v); paper.Box("gi_layer_lbl").Width(36).Height(22) - .Text("Layer", font).TextColor(EditorTheme.TextDim) + .Text("Layer", font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "gi_layer", "", go.Layer) @@ -150,7 +150,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game paper.Box($"{compId}_label") .Height(24) .Text($"{icon} {compName}", font) - .TextColor(comp.Enabled ? EditorTheme.Text : EditorTheme.TextDisabled) + .TextColor(comp.Enabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Spacer @@ -160,7 +160,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game using (paper.Box($"{compId}_gear") .Width(20).Height(24).Rounded(3) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.Ink500Dim) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .Enter()) { @@ -252,7 +252,7 @@ private static void DrawAddComponentButton(Paper paper, Prowl.Scribe.FontFile fo .BackgroundColor(EditorTheme.ButtonNormal) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text($"{EditorIcons.Plus} Add Component", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter) .OnClick(go, (g, _) => AddComponentPopup.Open(g)); } diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index 628ac58a..f2add7a6 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -38,7 +38,7 @@ public static void Draw(Paper paper) .Width(UnitValue.Auto) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(item.Label, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .Alignment(TextAlignment.MiddleCenter) .FontSize(EditorTheme.FontSize) .Enter()) @@ -85,7 +85,7 @@ private static void RenderDropdown(Paper paper, string id, List items, continue; } - var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled; + var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; // Menu item row — submenu is a child so IsParentHovered keeps it open using (paper.Row($"{id}_i_{index}") diff --git a/Prowl.Editor/Panels/GameViewPanel.cs b/Prowl.Editor/Panels/GameViewPanel.cs index d111cffe..f8a4d3f3 100644 --- a/Prowl.Editor/Panels/GameViewPanel.cs +++ b/Prowl.Editor/Panels/GameViewPanel.cs @@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("gv_cam_count") .Width(UnitValue.Auto).Height(22).ChildLeft(4).ChildRight(4) .Text($"{EditorIcons.Camera} {camCount} camera(s)", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight); } } @@ -86,7 +86,7 @@ private void DrawGameView(Paper paper, Prowl.Scribe.FontFile font, float width, .Size(width, height) .BackgroundColor(Color.FromArgb(255, 20, 20, 22)) .Text("No scene loaded", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter); return; } diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index b19e96b4..8ee1157a 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -62,7 +62,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("hier_empty").Height(60) .Text("No Scene Loaded", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); @@ -76,7 +76,7 @@ public override void OnGUI(Paper paper, float width, float height) .Height(22).ChildLeft(8) .BackgroundColor(EditorTheme.Neutral200) .Text($"{EditorIcons.Film} {scene.Name}", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); @@ -89,7 +89,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("hier_empty_scene").Height(40) .Text("Scene is empty", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleCenter); } @@ -212,7 +212,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) using (paper.Box("hier_add") .Width(RowHeight - 4).Height(RowHeight - 4).Rounded(4) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Ink500) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Enter()) { @@ -293,7 +293,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_arr_{goId}") .Width(14).Height(RowHeight) .Text(isExpanded ? EditorIcons.AngleDown : EditorIcons.AngleRight, font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(goId, (id, _) => { @@ -310,7 +310,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_ico_{goId}") .Width(16).Height(RowHeight) .Text(icon, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.TextDim : EditorTheme.TextDisabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500Dim : EditorTheme.Ink500Disabled) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); // Name or rename field @@ -345,7 +345,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_name_{goId}") .Height(RowHeight).ChildLeft(4) .Text(go.Name, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.Text : EditorTheme.TextDisabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } @@ -354,7 +354,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_vis_{goId}") .Width(18).Height(RowHeight) .Text(go.Enabled ? EditorIcons.Eye : EditorIcons.EyeSlash, font) - .TextColor(go.Enabled ? EditorTheme.TextDim : EditorTheme.TextDisabled) + .TextColor(go.Enabled ? EditorTheme.Ink500Dim : EditorTheme.Ink500Disabled) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .StopEventPropagation() .OnClick(go, (g, _) => g.Enabled = !g.Enabled); diff --git a/Prowl.Editor/Panels/InspectorPanel.cs b/Prowl.Editor/Panels/InspectorPanel.cs index 471e8fbd..7d5b625e 100644 --- a/Prowl.Editor/Panels/InspectorPanel.cs +++ b/Prowl.Editor/Panels/InspectorPanel.cs @@ -89,13 +89,13 @@ private void DrawEmpty(Paper paper, Prowl.Scribe.FontFile font, float width) { paper.Box("insp_empty").Height(80) .Text("Nothing Selected", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); paper.Box("insp_hint").Height(30) .Text("Select an asset or object to inspect it.", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize - 4) .Alignment(TextAlignment.MiddleCenter); } @@ -144,14 +144,14 @@ private void DrawSelectionHeader(Paper paper, Prowl.Scribe.FontFile font, object paper.Box("insp_h_name") .Height(18) .Text(name, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleLeft); paper.Box("insp_h_type") .Height(14) .Text(typeName, font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 4) .Alignment(TextAlignment.MiddleLeft); } @@ -291,14 +291,14 @@ private void DrawSubAssetInspector(Paper paper, Prowl.Scribe.FontFile font, Cont .BackgroundColor(System.Drawing.Color.FromArgb(255, 80, 80, 100)) .Rounded(4) .Text("Sub-Asset", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleCenter); paper.Box("insp_sub_name") .Height(28) .Text(item.Name, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index 52230656..c8de4a5a 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -36,7 +36,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("pref_sidebar_hdr") .Height(28).ChildLeft(8) - .Text("Preferences", font).TextColor(EditorTheme.Text) + .Text("Preferences", font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); EditorGUI.Separator(paper, "pref_sidebar_sep"); @@ -69,7 +69,7 @@ private void DrawTabBtn(Paper paper, Prowl.Scribe.FontFile font, string label, s .BackgroundColor(sel ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(sel ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {label}", font) - .TextColor(sel ? EditorTheme.Text : EditorTheme.TextDim) + .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(tab, (t, _) => _tab = t); diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index b5fbf62d..8eb22562 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -25,7 +25,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("ps_empty").Size(width, height) .Text("No settings registered", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); return; @@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("ps_sidebar_header") .Height(28).ChildLeft(8) - .Text("Settings", font).TextColor(EditorTheme.Text) + .Text("Settings", font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); EditorGUI.Separator(paper, "ps_sidebar_sep"); @@ -61,7 +61,7 @@ public override void OnGUI(Paper paper, float width, float height) .BackgroundColor(isSelected ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {entry.Name}", font) - .TextColor(isSelected ? EditorTheme.Text : EditorTheme.TextDim) + .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(idx, (id, _) => _selectedIndex = id); diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index 887fd939..efb8d447 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -63,7 +63,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isTranslate ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Translate)); @@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isRotate ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Rotate)); @@ -79,7 +79,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isScale ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.ScaleAll)); @@ -87,7 +87,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isUniversal ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Universal)); @@ -99,7 +99,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(showGrid ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => { if (_editorCamera != null) _editorCamera.ShowGrid = !_editorCamera.ShowGrid; }); @@ -114,7 +114,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) // paper.Box("sv_cam_info") // .Width(UnitValue.Auto).Height(24) // .ChildLeft(4).ChildRight(4) - // .Text(info, font).TextColor(EditorTheme.TextDim) + // .Text(info, font).TextColor(EditorTheme.Ink500Dim) // .FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight); //} } @@ -144,7 +144,7 @@ private void DrawViewport(Paper paper, Prowl.Scribe.FontFile font, float width, paper.Box("sv_no_scene_text") .Height(30) .Text("No Scene Loaded", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index 8af4e2b8..d68e6085 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -166,7 +166,7 @@ public override void OnGUI(Paper paper, float width, float height) .FontSize(EditorTheme.FontSize) .TextField(_textValue, EditorTheme.DefaultFont!, onChange: v => _textValue = v, - textColor: EditorTheme.Text); + textColor: EditorTheme.Ink500); EditorGUI.Separator(paper, "sep_raw"); @@ -340,7 +340,7 @@ public override void OnGUI(Paper paper, float width, float height) paper.Box("ctx_hint") .IsNotInteractable() .Text("Right-click here for a context menu", EditorTheme.DefaultFont) - .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Ink500Dim).FontSize(EditorTheme.FontSize); ContextMenuHelper.RightClickMenu(paper, "ctx_test", menu => { @@ -407,7 +407,7 @@ public override void OnGUI(Paper paper, float width, float height) .Tooltip("This is a tooltip! It appears after a short hover delay."); if (EditorTheme.DefaultFont != null) tooltipBtn.Text("Hover me for tooltip", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize); EditorGUI.Separator(paper, "sep13"); diff --git a/Prowl.Editor/Settings/TagsAndLayersSettings.cs b/Prowl.Editor/Settings/TagsAndLayersSettings.cs index 965b3c49..c5cc7c13 100644 --- a/Prowl.Editor/Settings/TagsAndLayersSettings.cs +++ b/Prowl.Editor/Settings/TagsAndLayersSettings.cs @@ -48,7 +48,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_name_{i}") .Height(22).ChildLeft(4) .Text(Tags[i], font) - .TextColor(isBuiltin ? EditorTheme.TextDim : EditorTheme.Text) + .TextColor(isBuiltin ? EditorTheme.Ink500Dim : EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); @@ -57,7 +57,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_del_{i}") .Width(20).Height(22).Rounded(3) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(idx, (id, _) => { @@ -98,13 +98,13 @@ public override void OnGUI(Paper paper, float width) { paper.Box($"tl_layer_idx_{i}") .Width(24).Height(22) - .Text(i.ToString(), font).TextColor(EditorTheme.TextDim) + .Text(i.ToString(), font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); paper.Box($"tl_layer_name_{i}") .Height(22).ChildLeft(4) - .Text(Layers[i], font).TextColor(EditorTheme.TextDim) + .Text(Layers[i], font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index ca890fac..4a7fd2c1 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -67,7 +67,7 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action { int ri=(int)(nc.R*255), gi=(int)(nc.G*255), bi=(int)(nc.B*255); paper.Box($"{id}_hex").Width(UnitValue.Stretch()).Height(24).ChildLeft(4).IsNotInteractable() - .Text($"#{ri:X2}{gi:X2}{bi:X2}{(int)(a*255):X2}", font).TextColor(EditorTheme.Text).FontSize(fontSize); + .Text($"#{ri:X2}{gi:X2}{bi:X2}{(int)(a*255):X2}", font).TextColor(EditorTheme.Ink500).FontSize(fontSize); } } @@ -79,7 +79,7 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action { var nc2 = new Prowl.Vector.Color(c.R,ng,c.B,c.A); SyncHSV(paper,el,nc2); onChange(nc2); }); ChannelSlider(paper, $"{id}_b", "B", c.B, SysColor.FromArgb(255,60,60,200), font, fontSize, nb => { var nc2 = new Prowl.Vector.Color(c.R,c.G,nb,c.A); SyncHSV(paper,el,nc2); onChange(nc2); }); - ChannelSlider(paper, $"{id}_a2", "A", a, EditorTheme.Text, font, fontSize, na => + ChannelSlider(paper, $"{id}_a2", "A", a, EditorTheme.Ink500, font, fontSize, na => { paper.SetElementStorage(el,"a",na); onChange(HSVToColor(paper.GetElementStorage(el,"h",h),paper.GetElementStorage(el,"s",s),paper.GetElementStorage(el,"v",v),na)); }); // === Color Palette === @@ -281,7 +281,7 @@ static void ChannelSlider(Paper paper, string id, string label, float value, Sys canvas.RoundedRectFilled((float)r.Min.X,(float)r.Min.Y,fillW,(float)r.Size.Y,2,0,0,2, new Prowl.Vector.Color(labelColor.R/255f,labelColor.G/255f,labelColor.B/255f,0.7f)); })); - if (font != null) paper.Box($"{id}_v").Width(28).IsNotInteractable().Text($"{(int)(value*255)}", font).TextColor(EditorTheme.Text).FontSize(fontSize); + if (font != null) paper.Box($"{id}_v").Width(28).IsNotInteractable().Text($"{(int)(value*255)}", font).TextColor(EditorTheme.Ink500).FontSize(fontSize); } } diff --git a/Prowl.Editor/Widgets/ContextMenuBuilder.cs b/Prowl.Editor/Widgets/ContextMenuBuilder.cs index 034db863..cafad852 100644 --- a/Prowl.Editor/Widgets/ContextMenuBuilder.cs +++ b/Prowl.Editor/Widgets/ContextMenuBuilder.cs @@ -72,7 +72,7 @@ public void Render(Paper paper, string id, float x, float y) continue; } - var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled; + var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; using (paper.Row($"{id}_i_{i}") .Height(EditorTheme.RowHeight) diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index c89b5807..dbdf91e3 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -33,7 +33,7 @@ public static WidgetResult CurveField(Paper paper, string id, st .Width(EditorTheme.LabelWidth).Height(40).ChildLeft(4) .IsNotInteractable() .Text(label, EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize); using (paper.Box($"{id}_preview") .Height(40).Width(UnitValue.Stretch()) @@ -307,7 +307,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< }); if (EditorTheme.DefaultFont != null) fitBtn.Text("Fit", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize - 2); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize - 2); // Save current curve to palette var saveBtn = paper.Box($"{id}_save_preset") @@ -332,7 +332,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< }); if (EditorTheme.DefaultFont != null) saveBtn.Text($"{EditorIcons.Plus} Save", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize - 2); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize - 2); } // Curve palette row diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index d7befa6b..5324318f 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -31,9 +31,9 @@ private static ElementBuilder.TextInputSettings MakeNumericSettings(Func Button(Paper paper, string id, string label, fl paper.Box($"{id}_label") .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); } @@ -132,7 +132,7 @@ public static WidgetResult ButtonSquare(Paper paper, string id, string ico paper.Box(id) .Alignment(PaperUI.TextAlignment.MiddleCenter) .Text(icon, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz) .Height(EditorTheme.RowHeight) .Width(EditorTheme.RowHeight) @@ -171,12 +171,12 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo .BorderColor(EditorTheme.Ink200).BorderWidth(1); if (value && Font != null) - box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Text).FontSize(12f); + box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Ink500).FontSize(12f); if (Font != null) paper.Box($"{id}_lbl") .Width(UnitValue.Auto) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); } return new WidgetResult(cb => userCallback = cb); @@ -198,7 +198,7 @@ public static WidgetResult TextField(Paper paper, string id, string labe if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); using (paper.Box($"{id}_input") .Height(EditorTheme.RowHeight) @@ -223,9 +223,9 @@ public static WidgetResult TextField(Paper paper, string id, string labe .FontSize(FontSz) .TextField(value, Font!, onChange: v => userCallback?.Invoke(v), - textColor: EditorTheme.Text, + textColor: EditorTheme.Ink500, placeholder: "", - placeholderColor: EditorTheme.TextDisabled, + placeholderColor: EditorTheme.Ink500Disabled, intID: id.GetHashCode()); } } @@ -250,7 +250,7 @@ public static WidgetResult FloatField(Paper paper, string id, float value if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(textColor ?? EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(textColor ?? EditorTheme.Ink500).FontSize(FontSz); using (paper.Box($"{id}_input") .Height(EditorTheme.RowHeight) @@ -305,7 +305,7 @@ public static WidgetResult IntField(Paper paper, string id, int value, stri if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(textColor ?? EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(textColor ?? EditorTheme.Ink500).FontSize(FontSz); using (paper.Box($"{id}_input") @@ -362,7 +362,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) .IsNotInteractable() .Text(label, Font) - .TextColor(EditorTheme.Text).FontSize(FontSz); + .TextColor(EditorTheme.Ink500).FontSize(FontSz); paper.Box($"{id}_track") .Height(EditorTheme.RowHeight) @@ -408,7 +408,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f } // ── Thumb body ──────────────────────────────────────── - canvas.SetFillColor(EditorTheme.Text); + canvas.SetFillColor(EditorTheme.Ink500); canvas.BeginPath(); canvas.Circle(thumbCx, thumbCy, thumbR, 24); canvas.Fill(); @@ -455,7 +455,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .MaxWidth(16) // .Text("\u25BC", Font) .Text(EditorIcons.ChevronDown, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(FontSz * 0.7f); } else @@ -465,12 +465,12 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .Width(16) .MaxWidth(16) .Text(EditorIcons.ChevronRight, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(FontSz * 0.7f); } paper.Box($"{id}_header_lbl") .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); } } @@ -501,7 +501,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); PaperUI.LayoutEngine.ElementHandle btnHandle = default; @@ -537,7 +537,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i paper.Box($"{id}_txt") .Width(UnitValue.Stretch()) .IsNotInteractable() - .Text(displayText, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(displayText, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // chevron down if open, right if closed if (isOpen) @@ -548,7 +548,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .MaxWidth(16) // .Text("\u25BC", Font) .Text(EditorIcons.ChevronUp, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(FontSz * 0.7f); } else @@ -559,7 +559,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .MaxWidth(16) // .Text("\u25B6", Font) .Text(EditorIcons.ChevronDown, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(FontSz * 0.7f); } } @@ -600,7 +600,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i }); if (Font != null) - opt.Text(options[i], Font).TextColor(EditorTheme.Text).FontSize(FontSz); + opt.Text(options[i], Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); } } } @@ -632,7 +632,7 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab paper.Box($"{id}_label") .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); } @@ -666,7 +666,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu paper.Box($"{id}_icon") .Width(16) .Margin(EditorTheme.RowHeight / 4, 0, EditorTheme.RowHeight / 8, 0) - .Text(EditorIcons.MagnifyingGlass, Font).TextColor(EditorTheme.TextDim).FontSize(FontSz * 0.7f); + .Text(EditorIcons.MagnifyingGlass, Font).TextColor(EditorTheme.Ink500Dim).FontSize(FontSz * 0.7f); paper.Box($"{id}_tf") .Height(EditorTheme.RowHeight) @@ -677,9 +677,9 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .Alignment(PaperUI.TextAlignment.MiddleLeft) .TextField(value, Font, onChange: v => userCallback?.Invoke(v), - textColor: EditorTheme.Text, + textColor: EditorTheme.Ink500, placeholder: placeholder, - placeholderColor: EditorTheme.TextDisabled, + placeholderColor: EditorTheme.Ink500Disabled, intID: id.GetHashCode()); if (!string.IsNullOrEmpty(value)) @@ -688,7 +688,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .Rounded(8) .Size(16).Margin(2, UnitValue.StretchOne) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.TextDim).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) + .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.Ink500Dim).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) .OnClick(e => userCallback?.Invoke("")); } } @@ -748,7 +748,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -779,7 +779,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -814,7 +814,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -856,7 +856,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, .IsNotInteractable() .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); // Color swatch (FocusWithin-based popup using cached ancestor set) @@ -888,7 +888,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, .IsNotInteractable() .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text($"#{r:X2}{g:X2}{b:X2}", Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz - 1); } @@ -925,7 +925,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) .IsNotInteractable() - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); paper.Box($"{id}_track") .Height(EditorTheme.RowHeight) @@ -957,7 +957,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr .Width(40).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text($"{(int)(progress * 100)}%", Font) - .TextColor(EditorTheme.Text).FontSize(FontSz); + .TextColor(EditorTheme.Ink500).FontSize(FontSz); } } diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 61e6898c..28decff9 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -276,7 +276,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) float btnW = 28f; // Back - var backColor = _historyIndex > 0 ? EditorTheme.Text : EditorTheme.TextDisabled; + var backColor = _historyIndex > 0 ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; paper.Box("fd_back").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowLeft, font).TextColor(backColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -285,7 +285,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .OnClick(0, (_, _) => NavigateBack()); // Forward - var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Text : EditorTheme.TextDisabled; + var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; paper.Box("fd_fwd").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowRight, font).TextColor(fwdColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -295,7 +295,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) // Up paper.Box("fd_up").Width(btnW).Height(ToolbarHeight) - .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(4) @@ -307,13 +307,13 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .BackgroundColor(EditorTheme.Neutral300) .Rounded(4) .ChildLeft(8) - .Text(_currentPath, font).TextColor(EditorTheme.Text) + .Text(_currentPath, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft); // New folder button paper.Box("fd_newfolder").Width(btnW).Height(ToolbarHeight) - .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(4) @@ -353,7 +353,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) { // Quick access paper.Box("fd_qa_label").Height(20) - .Text("Quick Access", font).TextColor(EditorTheme.TextDim) + .Text("Quick Access", font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft) .ChildLeft(8); @@ -366,7 +366,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) - .Text($"{icon} {label}", font).TextColor(EditorTheme.Text) + .Text($"{icon} {label}", font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft) .OnClick(qPath, (p, _) => NavigateTo(p)); } @@ -377,7 +377,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) // Drives paper.Box("fd_drv_label").Height(20) - .Text("Drives", font).TextColor(EditorTheme.TextDim) + .Text("Drives", font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft) .ChildLeft(8); @@ -393,7 +393,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) - .Text(dLabel, font).TextColor(EditorTheme.Text) + .Text(dLabel, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft) .OnClick(dName, (p, _) => NavigateTo(p)); } @@ -416,7 +416,7 @@ void ColHeader(string id, string label, int col, float? width = null) if (width.HasValue) el.Width(width.Value); el.ChildLeft(8) .Text(label + (_sortColumn == col ? (_sortAscending ? " \u25B4" : " \u25BE") : ""), font) - .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize - 3) + .TextColor(EditorTheme.Ink500Dim).FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .OnClick(col, (c, _) => @@ -450,7 +450,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) .Enter()) { paper.Box("fd_nf_ico").Width(20).Height(RowHeight) - .Text(EditorIcons.Folder, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Folder, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); EditorGUI.TextField(paper, "fd_nf_name", "Name", _newFolderName) @@ -508,7 +508,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) { // Icon + Name string icon = entry.IsDirectory ? EditorIcons.Folder : GetFileIcon(entry.Name); - var iconColor = entry.IsDirectory ? Color.FromArgb(255, 220, 180, 80) : EditorTheme.TextDim; + var iconColor = entry.IsDirectory ? Color.FromArgb(255, 220, 180, 80) : EditorTheme.Ink500Dim; paper.Box($"fd_ico_{i}").Width(20).Height(RowHeight) .Text(icon, font).TextColor(iconColor) @@ -516,20 +516,20 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) paper.Box($"fd_name_{i}").Height(RowHeight) .ChildLeft(4) - .Text(entry.Name, font).TextColor(EditorTheme.Text) + .Text(entry.Name, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); // Size string sizeText = entry.IsDirectory ? "" : FormatSize(entry.Size); paper.Box($"fd_size_{i}").Width(80).Height(RowHeight) - .Text(sizeText, font).TextColor(EditorTheme.TextDim) + .Text(sizeText, font).TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight) .ChildRight(8); // Date paper.Box($"fd_date_{i}").Width(140).Height(RowHeight) .Text(entry.LastModified.ToString("yyyy-MM-dd HH:mm"), font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink500Dim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight) .ChildRight(8); } @@ -538,7 +538,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) if (displayEntries.Count == 0) { paper.Box("fd_empty").Height(60) - .Text("This folder is empty", font).TextColor(EditorTheme.TextDisabled) + .Text("This folder is empty", font).TextColor(EditorTheme.Ink500Disabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter); } } @@ -559,7 +559,7 @@ private static void DrawBottomBar(Paper paper, Prowl.Scribe.FontFile font) { paper.Box("fd_name_lbl").Width(70).Height(24) .Text(_mode == FileDialogMode.SelectFolder ? "Folder:" : "File name:", font) - .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize - 2) + .TextColor(EditorTheme.Ink500Dim).FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "fd_filename", "", _fileName) diff --git a/Prowl.Editor/Widgets/ModalDialog.cs b/Prowl.Editor/Widgets/ModalDialog.cs index d907013a..3d7f0e93 100644 --- a/Prowl.Editor/Widgets/ModalDialog.cs +++ b/Prowl.Editor/Widgets/ModalDialog.cs @@ -128,7 +128,7 @@ public static void Draw(Paper paper) .Rounded(8) .ChildLeft(12) .Text(modal.Title, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize + 1); } diff --git a/Prowl.Editor/Widgets/PropertyGrid.cs b/Prowl.Editor/Widgets/PropertyGrid.cs index d6eec800..af2ab217 100644 --- a/Prowl.Editor/Widgets/PropertyGrid.cs +++ b/Prowl.Editor/Widgets/PropertyGrid.cs @@ -29,7 +29,7 @@ public static void Draw(Paper paper, string id, object target, Action? o { if (target == null) return; - if (depth > 10) { EditorGUI.Label(paper, $"{id}_deep", "(max depth)", EditorTheme.TextDim); return; } + if (depth > 10) { EditorGUI.Label(paper, $"{id}_deep", "(max depth)", EditorTheme.Ink500Dim); return; } var type = target.GetType(); var fields = GetSerializableFields(type); @@ -150,7 +150,7 @@ public static void DrawField(Paper paper, string id, string label, Type type, ob } // 7. Fallback - EditorGUI.Label(paper, id, $"{label}: {value ?? "(null)"}", EditorTheme.TextDim); + EditorGUI.Label(paper, id, $"{label}: {value ?? "(null)"}", EditorTheme.Ink500Dim); } // ================================================================ @@ -213,7 +213,7 @@ static void DrawTypePicker(Paper paper, string id, Type baseType, object? curren if (types.Length == 0) { - EditorGUI.Label(paper, $"{id}_none", "(no implementations)", EditorTheme.TextDim); + EditorGUI.Label(paper, $"{id}_none", "(no implementations)", EditorTheme.Ink500Dim); return; } diff --git a/Prowl.Editor/Widgets/Tooltip.cs b/Prowl.Editor/Widgets/Tooltip.cs index 8e891ae3..4725369d 100644 --- a/Prowl.Editor/Widgets/Tooltip.cs +++ b/Prowl.Editor/Widgets/Tooltip.cs @@ -73,7 +73,7 @@ public static void Draw(Paper paper) .Layer(Layer.Topmost) .IsNotInteractable() .Text(_pendingText, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1); _pendingText = null; From 2ef8d73022f2bf7bb1d1d3cefb50b225e72518ac Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:13:49 -0400 Subject: [PATCH 05/26] Revert "Replace EditorTheme.Text with EditorTheme.Ink500" This reverts commit 22f06acfe282cf8f2f07a1b2f58824acddb56b23. --- Prowl.Editor/DragDrop.cs | 2 +- Prowl.Editor/EditorApplication.cs | 12 ++-- Prowl.Editor/EditorTheme.cs | 10 +-- Prowl.Editor/Inspector/AddComponentPopup.cs | 12 ++-- .../Inspector/EngineObjectPropertyEditor.cs | 26 +++---- Prowl.Editor/Inspector/GameObjectInspector.cs | 10 +-- Prowl.Editor/MainMenuBar.cs | 4 +- Prowl.Editor/Panels/GameViewPanel.cs | 4 +- Prowl.Editor/Panels/HierarchyPanel.cs | 16 ++--- Prowl.Editor/Panels/InspectorPanel.cs | 12 ++-- Prowl.Editor/Panels/PreferencesPanel.cs | 4 +- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 6 +- Prowl.Editor/Panels/SceneViewPanel.cs | 14 ++-- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 6 +- .../Settings/TagsAndLayersSettings.cs | 8 +-- Prowl.Editor/Widgets/ColorPicker.cs | 6 +- Prowl.Editor/Widgets/ContextMenuBuilder.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 6 +- Prowl.Editor/Widgets/EditorGUI.cs | 70 +++++++++---------- Prowl.Editor/Widgets/FileDialog.cs | 34 ++++----- Prowl.Editor/Widgets/ModalDialog.cs | 2 +- Prowl.Editor/Widgets/PropertyGrid.cs | 6 +- Prowl.Editor/Widgets/Tooltip.cs | 2 +- 23 files changed, 137 insertions(+), 137 deletions(-) diff --git a/Prowl.Editor/DragDrop.cs b/Prowl.Editor/DragDrop.cs index 03dc6494..b84f7774 100644 --- a/Prowl.Editor/DragDrop.cs +++ b/Prowl.Editor/DragDrop.cs @@ -139,7 +139,7 @@ public static void DrawVisual(Paper paper) .IsNotInteractable() .Layer(Layer.Topmost) .Text($"{Payload.Icon} {Payload.DisplayName}", font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/EditorApplication.cs b/Prowl.Editor/EditorApplication.cs index eb0c0c5e..7e347c11 100644 --- a/Prowl.Editor/EditorApplication.cs +++ b/Prowl.Editor/EditorApplication.cs @@ -248,7 +248,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(w - 130, 0).Size(120, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text($"Prowl v{version}", font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); @@ -340,7 +340,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(bx, flapContentY).Size(projW, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text(projectText, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); @@ -362,7 +362,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(Application.IsPlaying ? System.Drawing.Color.FromArgb(255, 60, 160, 60) : System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.Play, font).TextColor(EditorTheme.Ink500).FontSize(14f) + .Text(EditorIcons.Play, font).TextColor(EditorTheme.Text).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, e) => Application.IsPlaying = !Application.IsPlaying); @@ -375,7 +375,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.Pause, font).TextColor(EditorTheme.Ink500).FontSize(14f) + .Text(EditorIcons.Pause, font).TextColor(EditorTheme.Text).FontSize(14f) .Alignment(TextAlignment.MiddleCenter); bx += btnSize + 4f; @@ -387,7 +387,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Ink500).FontSize(14f) + .Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Text).FontSize(14f) .Alignment(TextAlignment.MiddleCenter); bx += btnSize + 8f; @@ -407,7 +407,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(bx, flapContentY).Size(fpsW, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text(fpsText, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); } diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index 8da2b005..1e3a060b 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -42,14 +42,14 @@ public static class EditorTheme // public static Color MenuBarBackground => Darkest; // public static Color WindowBackground => Normal; // public static Color PanelBackground => Normal; - // public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); - // public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); + public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); + public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); // public static Color Border => Bright; // Text - // public static Color Text = Color.FromArgb(255, 220, 220, 220); - // public static Color TextDim = Color.FromArgb(255, 150, 150, 150); - // public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); + public static Color Text = Color.FromArgb(255, 220, 220, 220); + public static Color TextDim = Color.FromArgb(255, 150, 150, 150); + public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); // Interactive public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); diff --git a/Prowl.Editor/Inspector/AddComponentPopup.cs b/Prowl.Editor/Inspector/AddComponentPopup.cs index cf2f2a1f..3ae2d41e 100644 --- a/Prowl.Editor/Inspector/AddComponentPopup.cs +++ b/Prowl.Editor/Inspector/AddComponentPopup.cs @@ -79,7 +79,7 @@ public static void Draw(Paper paper) { paper.Box("acp_title").Height(32) .Text("Add Component", font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box("acp_spacer"); @@ -87,7 +87,7 @@ public static void Draw(Paper paper) paper.Box("acp_close") .Width(24).Height(24).Rounded(4) .Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => Close()); } @@ -120,7 +120,7 @@ public static void Draw(Paper paper) { paper.Box("acp_empty").Height(40) .Text("No matching components", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); } @@ -146,7 +146,7 @@ public static void Draw(Paper paper) paper.Box($"acp_cat_{category.GetHashCode()}") .Height(20).ChildLeft(8) .Text(category, font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft); foreach (var comp in group.OrderBy(c => c.Name)) @@ -183,13 +183,13 @@ private static void DrawComponentItem(Paper paper, Prowl.Scribe.FontFile font, s // Icon paper.Box($"{id}_ico") .Width(16).Height(EditorTheme.RowHeight) - .Text(comp.Icon, font).TextColor(EditorTheme.Ink500Dim) + .Text(comp.Icon, font).TextColor(EditorTheme.TextDim) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); // Name paper.Box($"{id}_name") .Height(EditorTheme.RowHeight) - .Text(comp.Name, font).TextColor(EditorTheme.Ink500) + .Text(comp.Name, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); } } diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 8bc5df62..2d81cafa 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, if (!string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(EditorTheme.LabelWidth).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, font).TextColor(EditorTheme.Ink500) + .Text(label, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Check if a compatible asset is being dragged over this field @@ -86,7 +86,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Width(16).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text(icon, font) - .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.Ink500Disabled) + .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.TextDisabled) .FontSize(10f).Alignment(TextAlignment.MiddleCenter); // Name @@ -94,13 +94,13 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Height(EditorTheme.RowHeight).Clip() .IsNotInteractable() .Text(displayName, font) - .TextColor(eo != null ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled) + .TextColor(eo != null ? EditorTheme.Text : EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); // Picker circle button paper.Box($"{id}_pick") .Width(20).Height(EditorTheme.RowHeight) - .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.Ink500Dim) + .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.TextDim) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.Accent).End() .Rounded(3) @@ -162,7 +162,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_title").Height(32) .Text($"Select {_selectorType.Name}", font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box("eo_sel_spacer"); @@ -170,7 +170,7 @@ public static void DrawSelectorModal(Paper paper) paper.Box("eo_sel_close") .Width(24).Height(24).Rounded(4) .Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => _selectorOpen = false); } @@ -184,7 +184,7 @@ public static void DrawSelectorModal(Paper paper) .Hovered.BackgroundColor(EditorTheme.Accent).End() .Rounded(3) .Text("None", font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft) .OnClick(0, (_, _) => { @@ -201,7 +201,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_bi_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.Cube} Built-In", font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); for (int i = 0; i < builtInItems.Count; i++) @@ -219,7 +219,7 @@ public static void DrawSelectorModal(Paper paper) paper.Box("eo_sel_proj_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.FolderOpen} Project", font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); for (int i = 0; i < projectItems.Count; i++) @@ -234,7 +234,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_empty").Height(40) .Text("No assets of this type found", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); } } @@ -257,17 +257,17 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st { paper.Box($"{id}_ico") .Width(14).Height(EditorTheme.RowHeight) - .Text(icon, font).TextColor(EditorTheme.Ink500Dim) + .Text(icon, font).TextColor(EditorTheme.TextDim) .FontSize(9f).Alignment(TextAlignment.MiddleCenter); paper.Box($"{id}_name") .Height(EditorTheme.RowHeight).Clip() - .Text(name, font).TextColor(EditorTheme.Ink500) + .Text(name, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box($"{id}_path") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildRight(4) - .Text($"({pathLabel})", font).TextColor(EditorTheme.Ink500Disabled) + .Text($"({pathLabel})", font).TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight); } } diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index 46cf2eae..f61df54b 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -61,14 +61,14 @@ private static void DrawHeader(Paper paper, Prowl.Scribe.FontFile font, GameObje .Enter()) { paper.Box("gi_tag_lbl").Width(30).Height(22) - .Text("Tag", font).TextColor(EditorTheme.Ink500Dim) + .Text("Tag", font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "gi_tag", "", go.Tag) .OnValueChanged(v => go.Tag = v); paper.Box("gi_layer_lbl").Width(36).Height(22) - .Text("Layer", font).TextColor(EditorTheme.Ink500Dim) + .Text("Layer", font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "gi_layer", "", go.Layer) @@ -150,7 +150,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game paper.Box($"{compId}_label") .Height(24) .Text($"{icon} {compName}", font) - .TextColor(comp.Enabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled) + .TextColor(comp.Enabled ? EditorTheme.Text : EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Spacer @@ -160,7 +160,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game using (paper.Box($"{compId}_gear") .Width(20).Height(24).Rounded(3) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.Ink500Dim) + .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.TextDim) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .Enter()) { @@ -252,7 +252,7 @@ private static void DrawAddComponentButton(Paper paper, Prowl.Scribe.FontFile fo .BackgroundColor(EditorTheme.ButtonNormal) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text($"{EditorIcons.Plus} Add Component", font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter) .OnClick(go, (g, _) => AddComponentPopup.Open(g)); } diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index f2add7a6..628ac58a 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -38,7 +38,7 @@ public static void Draw(Paper paper) .Width(UnitValue.Auto) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(item.Label, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .Alignment(TextAlignment.MiddleCenter) .FontSize(EditorTheme.FontSize) .Enter()) @@ -85,7 +85,7 @@ private static void RenderDropdown(Paper paper, string id, List items, continue; } - var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; + var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled; // Menu item row — submenu is a child so IsParentHovered keeps it open using (paper.Row($"{id}_i_{index}") diff --git a/Prowl.Editor/Panels/GameViewPanel.cs b/Prowl.Editor/Panels/GameViewPanel.cs index f8a4d3f3..d111cffe 100644 --- a/Prowl.Editor/Panels/GameViewPanel.cs +++ b/Prowl.Editor/Panels/GameViewPanel.cs @@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("gv_cam_count") .Width(UnitValue.Auto).Height(22).ChildLeft(4).ChildRight(4) .Text($"{EditorIcons.Camera} {camCount} camera(s)", font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight); } } @@ -86,7 +86,7 @@ private void DrawGameView(Paper paper, Prowl.Scribe.FontFile font, float width, .Size(width, height) .BackgroundColor(Color.FromArgb(255, 20, 20, 22)) .Text("No scene loaded", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter); return; } diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index 8ee1157a..b19e96b4 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -62,7 +62,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("hier_empty").Height(60) .Text("No Scene Loaded", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); @@ -76,7 +76,7 @@ public override void OnGUI(Paper paper, float width, float height) .Height(22).ChildLeft(8) .BackgroundColor(EditorTheme.Neutral200) .Text($"{EditorIcons.Film} {scene.Name}", font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); @@ -89,7 +89,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("hier_empty_scene").Height(40) .Text("Scene is empty", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleCenter); } @@ -212,7 +212,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) using (paper.Box("hier_add") .Width(RowHeight - 4).Height(RowHeight - 4).Rounded(4) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Text) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Enter()) { @@ -293,7 +293,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_arr_{goId}") .Width(14).Height(RowHeight) .Text(isExpanded ? EditorIcons.AngleDown : EditorIcons.AngleRight, font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(goId, (id, _) => { @@ -310,7 +310,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_ico_{goId}") .Width(16).Height(RowHeight) .Text(icon, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500Dim : EditorTheme.Ink500Disabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.TextDim : EditorTheme.TextDisabled) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); // Name or rename field @@ -345,7 +345,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_name_{goId}") .Height(RowHeight).ChildLeft(4) .Text(go.Name, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.Text : EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } @@ -354,7 +354,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_vis_{goId}") .Width(18).Height(RowHeight) .Text(go.Enabled ? EditorIcons.Eye : EditorIcons.EyeSlash, font) - .TextColor(go.Enabled ? EditorTheme.Ink500Dim : EditorTheme.Ink500Disabled) + .TextColor(go.Enabled ? EditorTheme.TextDim : EditorTheme.TextDisabled) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .StopEventPropagation() .OnClick(go, (g, _) => g.Enabled = !g.Enabled); diff --git a/Prowl.Editor/Panels/InspectorPanel.cs b/Prowl.Editor/Panels/InspectorPanel.cs index 7d5b625e..471e8fbd 100644 --- a/Prowl.Editor/Panels/InspectorPanel.cs +++ b/Prowl.Editor/Panels/InspectorPanel.cs @@ -89,13 +89,13 @@ private void DrawEmpty(Paper paper, Prowl.Scribe.FontFile font, float width) { paper.Box("insp_empty").Height(80) .Text("Nothing Selected", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); paper.Box("insp_hint").Height(30) .Text("Select an asset or object to inspect it.", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 4) .Alignment(TextAlignment.MiddleCenter); } @@ -144,14 +144,14 @@ private void DrawSelectionHeader(Paper paper, Prowl.Scribe.FontFile font, object paper.Box("insp_h_name") .Height(18) .Text(name, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleLeft); paper.Box("insp_h_type") .Height(14) .Text(typeName, font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 4) .Alignment(TextAlignment.MiddleLeft); } @@ -291,14 +291,14 @@ private void DrawSubAssetInspector(Paper paper, Prowl.Scribe.FontFile font, Cont .BackgroundColor(System.Drawing.Color.FromArgb(255, 80, 80, 100)) .Rounded(4) .Text("Sub-Asset", font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleCenter); paper.Box("insp_sub_name") .Height(28) .Text(item.Name, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index c8de4a5a..52230656 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -36,7 +36,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("pref_sidebar_hdr") .Height(28).ChildLeft(8) - .Text("Preferences", font).TextColor(EditorTheme.Ink500) + .Text("Preferences", font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); EditorGUI.Separator(paper, "pref_sidebar_sep"); @@ -69,7 +69,7 @@ private void DrawTabBtn(Paper paper, Prowl.Scribe.FontFile font, string label, s .BackgroundColor(sel ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(sel ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {label}", font) - .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.Ink500Dim) + .TextColor(sel ? EditorTheme.Text : EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(tab, (t, _) => _tab = t); diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index 8eb22562..b5fbf62d 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -25,7 +25,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("ps_empty").Size(width, height) .Text("No settings registered", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); return; @@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("ps_sidebar_header") .Height(28).ChildLeft(8) - .Text("Settings", font).TextColor(EditorTheme.Ink500) + .Text("Settings", font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); EditorGUI.Separator(paper, "ps_sidebar_sep"); @@ -61,7 +61,7 @@ public override void OnGUI(Paper paper, float width, float height) .BackgroundColor(isSelected ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {entry.Name}", font) - .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.Ink500Dim) + .TextColor(isSelected ? EditorTheme.Text : EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(idx, (id, _) => _selectedIndex = id); diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index efb8d447..887fd939 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -63,7 +63,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isTranslate ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Text) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Translate)); @@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isRotate ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Text) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Rotate)); @@ -79,7 +79,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isScale ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Text) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.ScaleAll)); @@ -87,7 +87,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isUniversal ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Text) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Universal)); @@ -99,7 +99,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(showGrid ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Text) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => { if (_editorCamera != null) _editorCamera.ShowGrid = !_editorCamera.ShowGrid; }); @@ -114,7 +114,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) // paper.Box("sv_cam_info") // .Width(UnitValue.Auto).Height(24) // .ChildLeft(4).ChildRight(4) - // .Text(info, font).TextColor(EditorTheme.Ink500Dim) + // .Text(info, font).TextColor(EditorTheme.TextDim) // .FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight); //} } @@ -144,7 +144,7 @@ private void DrawViewport(Paper paper, Prowl.Scribe.FontFile font, float width, paper.Box("sv_no_scene_text") .Height(30) .Text("No Scene Loaded", font) - .TextColor(EditorTheme.Ink500Disabled) + .TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index d68e6085..8af4e2b8 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -166,7 +166,7 @@ public override void OnGUI(Paper paper, float width, float height) .FontSize(EditorTheme.FontSize) .TextField(_textValue, EditorTheme.DefaultFont!, onChange: v => _textValue = v, - textColor: EditorTheme.Ink500); + textColor: EditorTheme.Text); EditorGUI.Separator(paper, "sep_raw"); @@ -340,7 +340,7 @@ public override void OnGUI(Paper paper, float width, float height) paper.Box("ctx_hint") .IsNotInteractable() .Text("Right-click here for a context menu", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Ink500Dim).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize); ContextMenuHelper.RightClickMenu(paper, "ctx_test", menu => { @@ -407,7 +407,7 @@ public override void OnGUI(Paper paper, float width, float height) .Tooltip("This is a tooltip! It appears after a short hover delay."); if (EditorTheme.DefaultFont != null) tooltipBtn.Text("Hover me for tooltip", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize); EditorGUI.Separator(paper, "sep13"); diff --git a/Prowl.Editor/Settings/TagsAndLayersSettings.cs b/Prowl.Editor/Settings/TagsAndLayersSettings.cs index c5cc7c13..965b3c49 100644 --- a/Prowl.Editor/Settings/TagsAndLayersSettings.cs +++ b/Prowl.Editor/Settings/TagsAndLayersSettings.cs @@ -48,7 +48,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_name_{i}") .Height(22).ChildLeft(4) .Text(Tags[i], font) - .TextColor(isBuiltin ? EditorTheme.Ink500Dim : EditorTheme.Ink500) + .TextColor(isBuiltin ? EditorTheme.TextDim : EditorTheme.Text) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); @@ -57,7 +57,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_del_{i}") .Width(20).Height(22).Rounded(3) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(idx, (id, _) => { @@ -98,13 +98,13 @@ public override void OnGUI(Paper paper, float width) { paper.Box($"tl_layer_idx_{i}") .Width(24).Height(22) - .Text(i.ToString(), font).TextColor(EditorTheme.Ink500Dim) + .Text(i.ToString(), font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); paper.Box($"tl_layer_name_{i}") .Height(22).ChildLeft(4) - .Text(Layers[i], font).TextColor(EditorTheme.Ink500Dim) + .Text(Layers[i], font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index 4a7fd2c1..ca890fac 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -67,7 +67,7 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action { int ri=(int)(nc.R*255), gi=(int)(nc.G*255), bi=(int)(nc.B*255); paper.Box($"{id}_hex").Width(UnitValue.Stretch()).Height(24).ChildLeft(4).IsNotInteractable() - .Text($"#{ri:X2}{gi:X2}{bi:X2}{(int)(a*255):X2}", font).TextColor(EditorTheme.Ink500).FontSize(fontSize); + .Text($"#{ri:X2}{gi:X2}{bi:X2}{(int)(a*255):X2}", font).TextColor(EditorTheme.Text).FontSize(fontSize); } } @@ -79,7 +79,7 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action { var nc2 = new Prowl.Vector.Color(c.R,ng,c.B,c.A); SyncHSV(paper,el,nc2); onChange(nc2); }); ChannelSlider(paper, $"{id}_b", "B", c.B, SysColor.FromArgb(255,60,60,200), font, fontSize, nb => { var nc2 = new Prowl.Vector.Color(c.R,c.G,nb,c.A); SyncHSV(paper,el,nc2); onChange(nc2); }); - ChannelSlider(paper, $"{id}_a2", "A", a, EditorTheme.Ink500, font, fontSize, na => + ChannelSlider(paper, $"{id}_a2", "A", a, EditorTheme.Text, font, fontSize, na => { paper.SetElementStorage(el,"a",na); onChange(HSVToColor(paper.GetElementStorage(el,"h",h),paper.GetElementStorage(el,"s",s),paper.GetElementStorage(el,"v",v),na)); }); // === Color Palette === @@ -281,7 +281,7 @@ static void ChannelSlider(Paper paper, string id, string label, float value, Sys canvas.RoundedRectFilled((float)r.Min.X,(float)r.Min.Y,fillW,(float)r.Size.Y,2,0,0,2, new Prowl.Vector.Color(labelColor.R/255f,labelColor.G/255f,labelColor.B/255f,0.7f)); })); - if (font != null) paper.Box($"{id}_v").Width(28).IsNotInteractable().Text($"{(int)(value*255)}", font).TextColor(EditorTheme.Ink500).FontSize(fontSize); + if (font != null) paper.Box($"{id}_v").Width(28).IsNotInteractable().Text($"{(int)(value*255)}", font).TextColor(EditorTheme.Text).FontSize(fontSize); } } diff --git a/Prowl.Editor/Widgets/ContextMenuBuilder.cs b/Prowl.Editor/Widgets/ContextMenuBuilder.cs index cafad852..034db863 100644 --- a/Prowl.Editor/Widgets/ContextMenuBuilder.cs +++ b/Prowl.Editor/Widgets/ContextMenuBuilder.cs @@ -72,7 +72,7 @@ public void Render(Paper paper, string id, float x, float y) continue; } - var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; + var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled; using (paper.Row($"{id}_i_{i}") .Height(EditorTheme.RowHeight) diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index dbdf91e3..c89b5807 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -33,7 +33,7 @@ public static WidgetResult CurveField(Paper paper, string id, st .Width(EditorTheme.LabelWidth).Height(40).ChildLeft(4) .IsNotInteractable() .Text(label, EditorTheme.DefaultFont) - .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize); using (paper.Box($"{id}_preview") .Height(40).Width(UnitValue.Stretch()) @@ -307,7 +307,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< }); if (EditorTheme.DefaultFont != null) fitBtn.Text("Fit", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize - 2); + .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize - 2); // Save current curve to palette var saveBtn = paper.Box($"{id}_save_preset") @@ -332,7 +332,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< }); if (EditorTheme.DefaultFont != null) saveBtn.Text($"{EditorIcons.Plus} Save", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize - 2); + .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize - 2); } // Curve palette row diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index 5324318f..d7befa6b 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -31,9 +31,9 @@ private static ElementBuilder.TextInputSettings MakeNumericSettings(Func Button(Paper paper, string id, string label, fl paper.Box($"{id}_label") .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(FontSz); } @@ -132,7 +132,7 @@ public static WidgetResult ButtonSquare(Paper paper, string id, string ico paper.Box(id) .Alignment(PaperUI.TextAlignment.MiddleCenter) .Text(icon, Font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(FontSz) .Height(EditorTheme.RowHeight) .Width(EditorTheme.RowHeight) @@ -171,12 +171,12 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo .BorderColor(EditorTheme.Ink200).BorderWidth(1); if (value && Font != null) - box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Ink500).FontSize(12f); + box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Text).FontSize(12f); if (Font != null) paper.Box($"{id}_lbl") .Width(UnitValue.Auto) - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); } return new WidgetResult(cb => userCallback = cb); @@ -198,7 +198,7 @@ public static WidgetResult TextField(Paper paper, string id, string labe if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); using (paper.Box($"{id}_input") .Height(EditorTheme.RowHeight) @@ -223,9 +223,9 @@ public static WidgetResult TextField(Paper paper, string id, string labe .FontSize(FontSz) .TextField(value, Font!, onChange: v => userCallback?.Invoke(v), - textColor: EditorTheme.Ink500, + textColor: EditorTheme.Text, placeholder: "", - placeholderColor: EditorTheme.Ink500Disabled, + placeholderColor: EditorTheme.TextDisabled, intID: id.GetHashCode()); } } @@ -250,7 +250,7 @@ public static WidgetResult FloatField(Paper paper, string id, float value if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(textColor ?? EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(textColor ?? EditorTheme.Text).FontSize(FontSz); using (paper.Box($"{id}_input") .Height(EditorTheme.RowHeight) @@ -305,7 +305,7 @@ public static WidgetResult IntField(Paper paper, string id, int value, stri if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(textColor ?? EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(textColor ?? EditorTheme.Text).FontSize(FontSz); using (paper.Box($"{id}_input") @@ -362,7 +362,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) .IsNotInteractable() .Text(label, Font) - .TextColor(EditorTheme.Ink500).FontSize(FontSz); + .TextColor(EditorTheme.Text).FontSize(FontSz); paper.Box($"{id}_track") .Height(EditorTheme.RowHeight) @@ -408,7 +408,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f } // ── Thumb body ──────────────────────────────────────── - canvas.SetFillColor(EditorTheme.Ink500); + canvas.SetFillColor(EditorTheme.Text); canvas.BeginPath(); canvas.Circle(thumbCx, thumbCy, thumbR, 24); canvas.Fill(); @@ -455,7 +455,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .MaxWidth(16) // .Text("\u25BC", Font) .Text(EditorIcons.ChevronDown, Font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(FontSz * 0.7f); } else @@ -465,12 +465,12 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .Width(16) .MaxWidth(16) .Text(EditorIcons.ChevronRight, Font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(FontSz * 0.7f); } paper.Box($"{id}_header_lbl") .Text(label, Font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(FontSz); } } @@ -501,7 +501,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); PaperUI.LayoutEngine.ElementHandle btnHandle = default; @@ -537,7 +537,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i paper.Box($"{id}_txt") .Width(UnitValue.Stretch()) .IsNotInteractable() - .Text(displayText, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(displayText, Font).TextColor(EditorTheme.Text).FontSize(FontSz); // chevron down if open, right if closed if (isOpen) @@ -548,7 +548,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .MaxWidth(16) // .Text("\u25BC", Font) .Text(EditorIcons.ChevronUp, Font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(FontSz * 0.7f); } else @@ -559,7 +559,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .MaxWidth(16) // .Text("\u25B6", Font) .Text(EditorIcons.ChevronDown, Font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(FontSz * 0.7f); } } @@ -600,7 +600,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i }); if (Font != null) - opt.Text(options[i], Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + opt.Text(options[i], Font).TextColor(EditorTheme.Text).FontSize(FontSz); } } } @@ -632,7 +632,7 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab paper.Box($"{id}_label") .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(FontSz); } @@ -666,7 +666,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu paper.Box($"{id}_icon") .Width(16) .Margin(EditorTheme.RowHeight / 4, 0, EditorTheme.RowHeight / 8, 0) - .Text(EditorIcons.MagnifyingGlass, Font).TextColor(EditorTheme.Ink500Dim).FontSize(FontSz * 0.7f); + .Text(EditorIcons.MagnifyingGlass, Font).TextColor(EditorTheme.TextDim).FontSize(FontSz * 0.7f); paper.Box($"{id}_tf") .Height(EditorTheme.RowHeight) @@ -677,9 +677,9 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .Alignment(PaperUI.TextAlignment.MiddleLeft) .TextField(value, Font, onChange: v => userCallback?.Invoke(v), - textColor: EditorTheme.Ink500, + textColor: EditorTheme.Text, placeholder: placeholder, - placeholderColor: EditorTheme.Ink500Disabled, + placeholderColor: EditorTheme.TextDisabled, intID: id.GetHashCode()); if (!string.IsNullOrEmpty(value)) @@ -688,7 +688,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .Rounded(8) .Size(16).Margin(2, UnitValue.StretchOne) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.Ink500Dim).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) + .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.TextDim).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) .OnClick(e => userCallback?.Invoke("")); } } @@ -748,7 +748,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -779,7 +779,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -814,7 +814,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -856,7 +856,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, .IsNotInteractable() .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(FontSz); // Color swatch (FocusWithin-based popup using cached ancestor set) @@ -888,7 +888,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, .IsNotInteractable() .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text($"#{r:X2}{g:X2}{b:X2}", Font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(FontSz - 1); } @@ -925,7 +925,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) .IsNotInteractable() - .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); paper.Box($"{id}_track") .Height(EditorTheme.RowHeight) @@ -957,7 +957,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr .Width(40).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text($"{(int)(progress * 100)}%", Font) - .TextColor(EditorTheme.Ink500).FontSize(FontSz); + .TextColor(EditorTheme.Text).FontSize(FontSz); } } diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 28decff9..61e6898c 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -276,7 +276,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) float btnW = 28f; // Back - var backColor = _historyIndex > 0 ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; + var backColor = _historyIndex > 0 ? EditorTheme.Text : EditorTheme.TextDisabled; paper.Box("fd_back").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowLeft, font).TextColor(backColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -285,7 +285,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .OnClick(0, (_, _) => NavigateBack()); // Forward - var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled; + var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Text : EditorTheme.TextDisabled; paper.Box("fd_fwd").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowRight, font).TextColor(fwdColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -295,7 +295,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) // Up paper.Box("fd_up").Width(btnW).Height(ToolbarHeight) - .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Ink500).FontSize(14f) + .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Text).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(4) @@ -307,13 +307,13 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .BackgroundColor(EditorTheme.Neutral300) .Rounded(4) .ChildLeft(8) - .Text(_currentPath, font).TextColor(EditorTheme.Ink500) + .Text(_currentPath, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft); // New folder button paper.Box("fd_newfolder").Width(btnW).Height(ToolbarHeight) - .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Ink500).FontSize(14f) + .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Text).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(4) @@ -353,7 +353,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) { // Quick access paper.Box("fd_qa_label").Height(20) - .Text("Quick Access", font).TextColor(EditorTheme.Ink500Dim) + .Text("Quick Access", font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft) .ChildLeft(8); @@ -366,7 +366,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) - .Text($"{icon} {label}", font).TextColor(EditorTheme.Ink500) + .Text($"{icon} {label}", font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft) .OnClick(qPath, (p, _) => NavigateTo(p)); } @@ -377,7 +377,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) // Drives paper.Box("fd_drv_label").Height(20) - .Text("Drives", font).TextColor(EditorTheme.Ink500Dim) + .Text("Drives", font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft) .ChildLeft(8); @@ -393,7 +393,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) - .Text(dLabel, font).TextColor(EditorTheme.Ink500) + .Text(dLabel, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft) .OnClick(dName, (p, _) => NavigateTo(p)); } @@ -416,7 +416,7 @@ void ColHeader(string id, string label, int col, float? width = null) if (width.HasValue) el.Width(width.Value); el.ChildLeft(8) .Text(label + (_sortColumn == col ? (_sortAscending ? " \u25B4" : " \u25BE") : ""), font) - .TextColor(EditorTheme.Ink500Dim).FontSize(EditorTheme.FontSize - 3) + .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .OnClick(col, (c, _) => @@ -450,7 +450,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) .Enter()) { paper.Box("fd_nf_ico").Width(20).Height(RowHeight) - .Text(EditorIcons.Folder, font).TextColor(EditorTheme.Ink500) + .Text(EditorIcons.Folder, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); EditorGUI.TextField(paper, "fd_nf_name", "Name", _newFolderName) @@ -508,7 +508,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) { // Icon + Name string icon = entry.IsDirectory ? EditorIcons.Folder : GetFileIcon(entry.Name); - var iconColor = entry.IsDirectory ? Color.FromArgb(255, 220, 180, 80) : EditorTheme.Ink500Dim; + var iconColor = entry.IsDirectory ? Color.FromArgb(255, 220, 180, 80) : EditorTheme.TextDim; paper.Box($"fd_ico_{i}").Width(20).Height(RowHeight) .Text(icon, font).TextColor(iconColor) @@ -516,20 +516,20 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) paper.Box($"fd_name_{i}").Height(RowHeight) .ChildLeft(4) - .Text(entry.Name, font).TextColor(EditorTheme.Ink500) + .Text(entry.Name, font).TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); // Size string sizeText = entry.IsDirectory ? "" : FormatSize(entry.Size); paper.Box($"fd_size_{i}").Width(80).Height(RowHeight) - .Text(sizeText, font).TextColor(EditorTheme.Ink500Dim) + .Text(sizeText, font).TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight) .ChildRight(8); // Date paper.Box($"fd_date_{i}").Width(140).Height(RowHeight) .Text(entry.LastModified.ToString("yyyy-MM-dd HH:mm"), font) - .TextColor(EditorTheme.Ink500Dim) + .TextColor(EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight) .ChildRight(8); } @@ -538,7 +538,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) if (displayEntries.Count == 0) { paper.Box("fd_empty").Height(60) - .Text("This folder is empty", font).TextColor(EditorTheme.Ink500Disabled) + .Text("This folder is empty", font).TextColor(EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter); } } @@ -559,7 +559,7 @@ private static void DrawBottomBar(Paper paper, Prowl.Scribe.FontFile font) { paper.Box("fd_name_lbl").Width(70).Height(24) .Text(_mode == FileDialogMode.SelectFolder ? "Folder:" : "File name:", font) - .TextColor(EditorTheme.Ink500Dim).FontSize(EditorTheme.FontSize - 2) + .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "fd_filename", "", _fileName) diff --git a/Prowl.Editor/Widgets/ModalDialog.cs b/Prowl.Editor/Widgets/ModalDialog.cs index 3d7f0e93..d907013a 100644 --- a/Prowl.Editor/Widgets/ModalDialog.cs +++ b/Prowl.Editor/Widgets/ModalDialog.cs @@ -128,7 +128,7 @@ public static void Draw(Paper paper) .Rounded(8) .ChildLeft(12) .Text(modal.Title, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize + 1); } diff --git a/Prowl.Editor/Widgets/PropertyGrid.cs b/Prowl.Editor/Widgets/PropertyGrid.cs index af2ab217..d6eec800 100644 --- a/Prowl.Editor/Widgets/PropertyGrid.cs +++ b/Prowl.Editor/Widgets/PropertyGrid.cs @@ -29,7 +29,7 @@ public static void Draw(Paper paper, string id, object target, Action? o { if (target == null) return; - if (depth > 10) { EditorGUI.Label(paper, $"{id}_deep", "(max depth)", EditorTheme.Ink500Dim); return; } + if (depth > 10) { EditorGUI.Label(paper, $"{id}_deep", "(max depth)", EditorTheme.TextDim); return; } var type = target.GetType(); var fields = GetSerializableFields(type); @@ -150,7 +150,7 @@ public static void DrawField(Paper paper, string id, string label, Type type, ob } // 7. Fallback - EditorGUI.Label(paper, id, $"{label}: {value ?? "(null)"}", EditorTheme.Ink500Dim); + EditorGUI.Label(paper, id, $"{label}: {value ?? "(null)"}", EditorTheme.TextDim); } // ================================================================ @@ -213,7 +213,7 @@ static void DrawTypePicker(Paper paper, string id, Type baseType, object? curren if (types.Length == 0) { - EditorGUI.Label(paper, $"{id}_none", "(no implementations)", EditorTheme.Ink500Dim); + EditorGUI.Label(paper, $"{id}_none", "(no implementations)", EditorTheme.TextDim); return; } diff --git a/Prowl.Editor/Widgets/Tooltip.cs b/Prowl.Editor/Widgets/Tooltip.cs index 4725369d..8e891ae3 100644 --- a/Prowl.Editor/Widgets/Tooltip.cs +++ b/Prowl.Editor/Widgets/Tooltip.cs @@ -73,7 +73,7 @@ public static void Draw(Paper paper) .Layer(Layer.Topmost) .IsNotInteractable() .Text(_pendingText, font) - .TextColor(EditorTheme.Ink500) + .TextColor(EditorTheme.Text) .FontSize(EditorTheme.FontSize - 1); _pendingText = null; From c3f81eef2350908bc10377fc7a9c6fdac84aea5f Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:16:11 -0400 Subject: [PATCH 06/26] Replace EditorTheme.Text with EditorTheme.Ink500 --- Prowl.Editor/DragDrop.cs | 2 +- Prowl.Editor/EditorApplication.cs | 10 ++-- Prowl.Editor/Inspector/AddComponentPopup.cs | 4 +- .../Inspector/EngineObjectPropertyEditor.cs | 8 +-- Prowl.Editor/Inspector/GameObjectInspector.cs | 4 +- Prowl.Editor/MainMenuBar.cs | 4 +- Prowl.Editor/Panels/HierarchyPanel.cs | 6 +-- Prowl.Editor/Panels/InspectorPanel.cs | 6 +-- Prowl.Editor/Panels/PreferencesPanel.cs | 4 +- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 4 +- Prowl.Editor/Panels/SceneViewPanel.cs | 10 ++-- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 4 +- .../Settings/TagsAndLayersSettings.cs | 2 +- Prowl.Editor/Widgets/ColorPicker.cs | 6 +-- Prowl.Editor/Widgets/ContextMenuBuilder.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 6 +-- Prowl.Editor/Widgets/EditorGUI.cs | 52 +++++++++---------- Prowl.Editor/Widgets/FileDialog.cs | 18 +++---- Prowl.Editor/Widgets/ModalDialog.cs | 2 +- Prowl.Editor/Widgets/Tooltip.cs | 2 +- 20 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Prowl.Editor/DragDrop.cs b/Prowl.Editor/DragDrop.cs index b84f7774..03dc6494 100644 --- a/Prowl.Editor/DragDrop.cs +++ b/Prowl.Editor/DragDrop.cs @@ -139,7 +139,7 @@ public static void DrawVisual(Paper paper) .IsNotInteractable() .Layer(Layer.Topmost) .Text($"{Payload.Icon} {Payload.DisplayName}", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/EditorApplication.cs b/Prowl.Editor/EditorApplication.cs index 7e347c11..f36016ea 100644 --- a/Prowl.Editor/EditorApplication.cs +++ b/Prowl.Editor/EditorApplication.cs @@ -340,7 +340,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(bx, flapContentY).Size(projW, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text(projectText, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); @@ -362,7 +362,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(Application.IsPlaying ? System.Drawing.Color.FromArgb(255, 60, 160, 60) : System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.Play, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.Play, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, e) => Application.IsPlaying = !Application.IsPlaying); @@ -375,7 +375,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.Pause, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.Pause, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter); bx += btnSize + 4f; @@ -387,7 +387,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Rounded(4) .BackgroundColor(System.Drawing.Color.Transparent) .Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End() - .Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter); bx += btnSize + 8f; @@ -407,7 +407,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(bx, flapContentY).Size(fpsW, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text(fpsText, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); } diff --git a/Prowl.Editor/Inspector/AddComponentPopup.cs b/Prowl.Editor/Inspector/AddComponentPopup.cs index 3ae2d41e..be594e40 100644 --- a/Prowl.Editor/Inspector/AddComponentPopup.cs +++ b/Prowl.Editor/Inspector/AddComponentPopup.cs @@ -79,7 +79,7 @@ public static void Draw(Paper paper) { paper.Box("acp_title").Height(32) .Text("Add Component", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box("acp_spacer"); @@ -189,7 +189,7 @@ private static void DrawComponentItem(Paper paper, Prowl.Scribe.FontFile font, s // Name paper.Box($"{id}_name") .Height(EditorTheme.RowHeight) - .Text(comp.Name, font).TextColor(EditorTheme.Text) + .Text(comp.Name, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); } } diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 2d81cafa..50a386e8 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, if (!string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(EditorTheme.LabelWidth).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, font).TextColor(EditorTheme.Text) + .Text(label, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Check if a compatible asset is being dragged over this field @@ -94,7 +94,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Height(EditorTheme.RowHeight).Clip() .IsNotInteractable() .Text(displayName, font) - .TextColor(eo != null ? EditorTheme.Text : EditorTheme.TextDisabled) + .TextColor(eo != null ? EditorTheme.Ink500 : EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); // Picker circle button @@ -162,7 +162,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_title").Height(32) .Text($"Select {_selectorType.Name}", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box("eo_sel_spacer"); @@ -262,7 +262,7 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st paper.Box($"{id}_name") .Height(EditorTheme.RowHeight).Clip() - .Text(name, font).TextColor(EditorTheme.Text) + .Text(name, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); paper.Box($"{id}_path") diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index f61df54b..42faf698 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -150,7 +150,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game paper.Box($"{compId}_label") .Height(24) .Text($"{icon} {compName}", font) - .TextColor(comp.Enabled ? EditorTheme.Text : EditorTheme.TextDisabled) + .TextColor(comp.Enabled ? EditorTheme.Ink500 : EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Spacer @@ -252,7 +252,7 @@ private static void DrawAddComponentButton(Paper paper, Prowl.Scribe.FontFile fo .BackgroundColor(EditorTheme.ButtonNormal) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text($"{EditorIcons.Plus} Add Component", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter) .OnClick(go, (g, _) => AddComponentPopup.Open(g)); } diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index 628ac58a..0c07f7cb 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -38,7 +38,7 @@ public static void Draw(Paper paper) .Width(UnitValue.Auto) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(item.Label, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .Alignment(TextAlignment.MiddleCenter) .FontSize(EditorTheme.FontSize) .Enter()) @@ -85,7 +85,7 @@ private static void RenderDropdown(Paper paper, string id, List items, continue; } - var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled; + var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.TextDisabled; // Menu item row — submenu is a child so IsParentHovered keeps it open using (paper.Row($"{id}_i_{index}") diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index b19e96b4..cd4e7505 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -76,7 +76,7 @@ public override void OnGUI(Paper paper, float width, float height) .Height(22).ChildLeft(8) .BackgroundColor(EditorTheme.Neutral200) .Text($"{EditorIcons.Film} {scene.Name}", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); @@ -212,7 +212,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) using (paper.Box("hier_add") .Width(RowHeight - 4).Height(RowHeight - 4).Rounded(4) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Ink500) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Enter()) { @@ -345,7 +345,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_name_{goId}") .Height(RowHeight).ChildLeft(4) .Text(go.Name, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.Text : EditorTheme.TextDisabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500 : EditorTheme.TextDisabled) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Panels/InspectorPanel.cs b/Prowl.Editor/Panels/InspectorPanel.cs index 471e8fbd..1e583dad 100644 --- a/Prowl.Editor/Panels/InspectorPanel.cs +++ b/Prowl.Editor/Panels/InspectorPanel.cs @@ -144,7 +144,7 @@ private void DrawSelectionHeader(Paper paper, Prowl.Scribe.FontFile font, object paper.Box("insp_h_name") .Height(18) .Text(name, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleLeft); @@ -291,14 +291,14 @@ private void DrawSubAssetInspector(Paper paper, Prowl.Scribe.FontFile font, Cont .BackgroundColor(System.Drawing.Color.FromArgb(255, 80, 80, 100)) .Rounded(4) .Text("Sub-Asset", font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleCenter); paper.Box("insp_sub_name") .Height(28) .Text(item.Name, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index 52230656..c6671353 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -36,7 +36,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("pref_sidebar_hdr") .Height(28).ChildLeft(8) - .Text("Preferences", font).TextColor(EditorTheme.Text) + .Text("Preferences", font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); EditorGUI.Separator(paper, "pref_sidebar_sep"); @@ -69,7 +69,7 @@ private void DrawTabBtn(Paper paper, Prowl.Scribe.FontFile font, string label, s .BackgroundColor(sel ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(sel ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {label}", font) - .TextColor(sel ? EditorTheme.Text : EditorTheme.TextDim) + .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(tab, (t, _) => _tab = t); diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index b5fbf62d..147a3777 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("ps_sidebar_header") .Height(28).ChildLeft(8) - .Text("Settings", font).TextColor(EditorTheme.Text) + .Text("Settings", font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); EditorGUI.Separator(paper, "ps_sidebar_sep"); @@ -61,7 +61,7 @@ public override void OnGUI(Paper paper, float width, float height) .BackgroundColor(isSelected ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {entry.Name}", font) - .TextColor(isSelected ? EditorTheme.Text : EditorTheme.TextDim) + .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.TextDim) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(idx, (id, _) => _selectedIndex = id); diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index 887fd939..f7c5b66a 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -63,7 +63,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isTranslate ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Translate)); @@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isRotate ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Rotate)); @@ -79,7 +79,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isScale ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.ScaleAll)); @@ -87,7 +87,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(isUniversal ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Universal)); @@ -99,7 +99,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) .Width(24).Height(24).Rounded(4) .BackgroundColor(showGrid ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => { if (_editorCamera != null) _editorCamera.ShowGrid = !_editorCamera.ShowGrid; }); diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index 8af4e2b8..78caab22 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -166,7 +166,7 @@ public override void OnGUI(Paper paper, float width, float height) .FontSize(EditorTheme.FontSize) .TextField(_textValue, EditorTheme.DefaultFont!, onChange: v => _textValue = v, - textColor: EditorTheme.Text); + textColor: EditorTheme.Ink500); EditorGUI.Separator(paper, "sep_raw"); @@ -407,7 +407,7 @@ public override void OnGUI(Paper paper, float width, float height) .Tooltip("This is a tooltip! It appears after a short hover delay."); if (EditorTheme.DefaultFont != null) tooltipBtn.Text("Hover me for tooltip", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize); EditorGUI.Separator(paper, "sep13"); diff --git a/Prowl.Editor/Settings/TagsAndLayersSettings.cs b/Prowl.Editor/Settings/TagsAndLayersSettings.cs index 965b3c49..f0bc016f 100644 --- a/Prowl.Editor/Settings/TagsAndLayersSettings.cs +++ b/Prowl.Editor/Settings/TagsAndLayersSettings.cs @@ -48,7 +48,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_name_{i}") .Height(22).ChildLeft(4) .Text(Tags[i], font) - .TextColor(isBuiltin ? EditorTheme.TextDim : EditorTheme.Text) + .TextColor(isBuiltin ? EditorTheme.TextDim : EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index ca890fac..4a7fd2c1 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -67,7 +67,7 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action { int ri=(int)(nc.R*255), gi=(int)(nc.G*255), bi=(int)(nc.B*255); paper.Box($"{id}_hex").Width(UnitValue.Stretch()).Height(24).ChildLeft(4).IsNotInteractable() - .Text($"#{ri:X2}{gi:X2}{bi:X2}{(int)(a*255):X2}", font).TextColor(EditorTheme.Text).FontSize(fontSize); + .Text($"#{ri:X2}{gi:X2}{bi:X2}{(int)(a*255):X2}", font).TextColor(EditorTheme.Ink500).FontSize(fontSize); } } @@ -79,7 +79,7 @@ public static void Draw(Paper paper, string id, Prowl.Vector.Color value, Action { var nc2 = new Prowl.Vector.Color(c.R,ng,c.B,c.A); SyncHSV(paper,el,nc2); onChange(nc2); }); ChannelSlider(paper, $"{id}_b", "B", c.B, SysColor.FromArgb(255,60,60,200), font, fontSize, nb => { var nc2 = new Prowl.Vector.Color(c.R,c.G,nb,c.A); SyncHSV(paper,el,nc2); onChange(nc2); }); - ChannelSlider(paper, $"{id}_a2", "A", a, EditorTheme.Text, font, fontSize, na => + ChannelSlider(paper, $"{id}_a2", "A", a, EditorTheme.Ink500, font, fontSize, na => { paper.SetElementStorage(el,"a",na); onChange(HSVToColor(paper.GetElementStorage(el,"h",h),paper.GetElementStorage(el,"s",s),paper.GetElementStorage(el,"v",v),na)); }); // === Color Palette === @@ -281,7 +281,7 @@ static void ChannelSlider(Paper paper, string id, string label, float value, Sys canvas.RoundedRectFilled((float)r.Min.X,(float)r.Min.Y,fillW,(float)r.Size.Y,2,0,0,2, new Prowl.Vector.Color(labelColor.R/255f,labelColor.G/255f,labelColor.B/255f,0.7f)); })); - if (font != null) paper.Box($"{id}_v").Width(28).IsNotInteractable().Text($"{(int)(value*255)}", font).TextColor(EditorTheme.Text).FontSize(fontSize); + if (font != null) paper.Box($"{id}_v").Width(28).IsNotInteractable().Text($"{(int)(value*255)}", font).TextColor(EditorTheme.Ink500).FontSize(fontSize); } } diff --git a/Prowl.Editor/Widgets/ContextMenuBuilder.cs b/Prowl.Editor/Widgets/ContextMenuBuilder.cs index 034db863..58144e8c 100644 --- a/Prowl.Editor/Widgets/ContextMenuBuilder.cs +++ b/Prowl.Editor/Widgets/ContextMenuBuilder.cs @@ -72,7 +72,7 @@ public void Render(Paper paper, string id, float x, float y) continue; } - var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled; + var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.TextDisabled; using (paper.Row($"{id}_i_{i}") .Height(EditorTheme.RowHeight) diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index c89b5807..dbdf91e3 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -33,7 +33,7 @@ public static WidgetResult CurveField(Paper paper, string id, st .Width(EditorTheme.LabelWidth).Height(40).ChildLeft(4) .IsNotInteractable() .Text(label, EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize); using (paper.Box($"{id}_preview") .Height(40).Width(UnitValue.Stretch()) @@ -307,7 +307,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< }); if (EditorTheme.DefaultFont != null) fitBtn.Text("Fit", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize - 2); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize - 2); // Save current curve to palette var saveBtn = paper.Box($"{id}_save_preset") @@ -332,7 +332,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< }); if (EditorTheme.DefaultFont != null) saveBtn.Text($"{EditorIcons.Plus} Save", EditorTheme.DefaultFont) - .TextColor(EditorTheme.Text).FontSize(EditorTheme.FontSize - 2); + .TextColor(EditorTheme.Ink500).FontSize(EditorTheme.FontSize - 2); } // Curve palette row diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index d7befa6b..d5f76c50 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -31,7 +31,7 @@ private static ElementBuilder.TextInputSettings MakeNumericSettings(Func Button(Paper paper, string id, string label, fl paper.Box($"{id}_label") .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); } @@ -132,7 +132,7 @@ public static WidgetResult ButtonSquare(Paper paper, string id, string ico paper.Box(id) .Alignment(PaperUI.TextAlignment.MiddleCenter) .Text(icon, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz) .Height(EditorTheme.RowHeight) .Width(EditorTheme.RowHeight) @@ -171,12 +171,12 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo .BorderColor(EditorTheme.Ink200).BorderWidth(1); if (value && Font != null) - box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Text).FontSize(12f); + box.Text(EditorIcons.Check, Font).TextColor(EditorTheme.Ink500).FontSize(12f); if (Font != null) paper.Box($"{id}_lbl") .Width(UnitValue.Auto) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); } return new WidgetResult(cb => userCallback = cb); @@ -198,7 +198,7 @@ public static WidgetResult TextField(Paper paper, string id, string labe if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); using (paper.Box($"{id}_input") .Height(EditorTheme.RowHeight) @@ -223,7 +223,7 @@ public static WidgetResult TextField(Paper paper, string id, string labe .FontSize(FontSz) .TextField(value, Font!, onChange: v => userCallback?.Invoke(v), - textColor: EditorTheme.Text, + textColor: EditorTheme.Ink500, placeholder: "", placeholderColor: EditorTheme.TextDisabled, intID: id.GetHashCode()); @@ -250,7 +250,7 @@ public static WidgetResult FloatField(Paper paper, string id, float value if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(textColor ?? EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(textColor ?? EditorTheme.Ink500).FontSize(FontSz); using (paper.Box($"{id}_input") .Height(EditorTheme.RowHeight) @@ -305,7 +305,7 @@ public static WidgetResult IntField(Paper paper, string id, int value, stri if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(textColor ?? EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(textColor ?? EditorTheme.Ink500).FontSize(FontSz); using (paper.Box($"{id}_input") @@ -362,7 +362,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) .IsNotInteractable() .Text(label, Font) - .TextColor(EditorTheme.Text).FontSize(FontSz); + .TextColor(EditorTheme.Ink500).FontSize(FontSz); paper.Box($"{id}_track") .Height(EditorTheme.RowHeight) @@ -408,7 +408,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f } // ── Thumb body ──────────────────────────────────────── - canvas.SetFillColor(EditorTheme.Text); + canvas.SetFillColor(EditorTheme.Ink500); canvas.BeginPath(); canvas.Circle(thumbCx, thumbCy, thumbR, 24); canvas.Fill(); @@ -470,7 +470,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont } paper.Box($"{id}_header_lbl") .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); } } @@ -501,7 +501,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); PaperUI.LayoutEngine.ElementHandle btnHandle = default; @@ -537,7 +537,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i paper.Box($"{id}_txt") .Width(UnitValue.Stretch()) .IsNotInteractable() - .Text(displayText, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(displayText, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // chevron down if open, right if closed if (isOpen) @@ -600,7 +600,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i }); if (Font != null) - opt.Text(options[i], Font).TextColor(EditorTheme.Text).FontSize(FontSz); + opt.Text(options[i], Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); } } } @@ -632,7 +632,7 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab paper.Box($"{id}_label") .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); } @@ -677,7 +677,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .Alignment(PaperUI.TextAlignment.MiddleLeft) .TextField(value, Font, onChange: v => userCallback?.Invoke(v), - textColor: EditorTheme.Text, + textColor: EditorTheme.Ink500, placeholder: placeholder, placeholderColor: EditorTheme.TextDisabled, intID: id.GetHashCode()); @@ -748,7 +748,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -779,7 +779,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -814,7 +814,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, if (Font != null && !string.IsNullOrEmpty(label)) paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); // X FloatField(paper, $"{id}_x", (float)current.X, "X", Color.FromArgb(255, 200, 80, 80)) @@ -856,7 +856,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, .IsNotInteractable() .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz); // Color swatch (FocusWithin-based popup using cached ancestor set) @@ -888,7 +888,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, .IsNotInteractable() .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text($"#{r:X2}{g:X2}{b:X2}", Font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(FontSz - 1); } @@ -925,7 +925,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr paper.Box($"{id}_lbl") .Width(LabelW).Height(EditorTheme.RowHeight).ChildLeft(4) .IsNotInteractable() - .Text(label, Font).TextColor(EditorTheme.Text).FontSize(FontSz); + .Text(label, Font).TextColor(EditorTheme.Ink500).FontSize(FontSz); paper.Box($"{id}_track") .Height(EditorTheme.RowHeight) @@ -957,7 +957,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr .Width(40).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text($"{(int)(progress * 100)}%", Font) - .TextColor(EditorTheme.Text).FontSize(FontSz); + .TextColor(EditorTheme.Ink500).FontSize(FontSz); } } diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 61e6898c..eda366aa 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -276,7 +276,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) float btnW = 28f; // Back - var backColor = _historyIndex > 0 ? EditorTheme.Text : EditorTheme.TextDisabled; + var backColor = _historyIndex > 0 ? EditorTheme.Ink500 : EditorTheme.TextDisabled; paper.Box("fd_back").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowLeft, font).TextColor(backColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -285,7 +285,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .OnClick(0, (_, _) => NavigateBack()); // Forward - var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Text : EditorTheme.TextDisabled; + var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Ink500 : EditorTheme.TextDisabled; paper.Box("fd_fwd").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowRight, font).TextColor(fwdColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -295,7 +295,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) // Up paper.Box("fd_up").Width(btnW).Height(ToolbarHeight) - .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(4) @@ -307,13 +307,13 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .BackgroundColor(EditorTheme.Neutral300) .Rounded(4) .ChildLeft(8) - .Text(_currentPath, font).TextColor(EditorTheme.Text) + .Text(_currentPath, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft); // New folder button paper.Box("fd_newfolder").Width(btnW).Height(ToolbarHeight) - .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Text).FontSize(14f) + .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(4) @@ -366,7 +366,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) - .Text($"{icon} {label}", font).TextColor(EditorTheme.Text) + .Text($"{icon} {label}", font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft) .OnClick(qPath, (p, _) => NavigateTo(p)); } @@ -393,7 +393,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) - .Text(dLabel, font).TextColor(EditorTheme.Text) + .Text(dLabel, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft) .OnClick(dName, (p, _) => NavigateTo(p)); } @@ -450,7 +450,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) .Enter()) { paper.Box("fd_nf_ico").Width(20).Height(RowHeight) - .Text(EditorIcons.Folder, font).TextColor(EditorTheme.Text) + .Text(EditorIcons.Folder, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); EditorGUI.TextField(paper, "fd_nf_name", "Name", _newFolderName) @@ -516,7 +516,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) paper.Box($"fd_name_{i}").Height(RowHeight) .ChildLeft(4) - .Text(entry.Name, font).TextColor(EditorTheme.Text) + .Text(entry.Name, font).TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); // Size diff --git a/Prowl.Editor/Widgets/ModalDialog.cs b/Prowl.Editor/Widgets/ModalDialog.cs index d907013a..3d7f0e93 100644 --- a/Prowl.Editor/Widgets/ModalDialog.cs +++ b/Prowl.Editor/Widgets/ModalDialog.cs @@ -128,7 +128,7 @@ public static void Draw(Paper paper) .Rounded(8) .ChildLeft(12) .Text(modal.Title, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize + 1); } diff --git a/Prowl.Editor/Widgets/Tooltip.cs b/Prowl.Editor/Widgets/Tooltip.cs index 8e891ae3..4725369d 100644 --- a/Prowl.Editor/Widgets/Tooltip.cs +++ b/Prowl.Editor/Widgets/Tooltip.cs @@ -73,7 +73,7 @@ public static void Draw(Paper paper) .Layer(Layer.Topmost) .IsNotInteractable() .Text(_pendingText, font) - .TextColor(EditorTheme.Text) + .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1); _pendingText = null; From 8862fc46ef90947f5f3b8d96c5c409b3212a0905 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:18:10 -0400 Subject: [PATCH 07/26] Replace TextDim with Ink400 and TextDisabled with Ink300 --- Prowl.Editor/EditorApplication.cs | 2 +- Prowl.Editor/Inspector/AddComponentPopup.cs | 8 ++++---- .../Inspector/EngineObjectPropertyEditor.cs | 20 +++++++++---------- Prowl.Editor/Inspector/GameObjectInspector.cs | 8 ++++---- Prowl.Editor/MainMenuBar.cs | 2 +- Prowl.Editor/Panels/GameViewPanel.cs | 4 ++-- Prowl.Editor/Panels/HierarchyPanel.cs | 12 +++++------ Prowl.Editor/Panels/InspectorPanel.cs | 6 +++--- Prowl.Editor/Panels/PreferencesPanel.cs | 2 +- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 4 ++-- Prowl.Editor/Panels/SceneViewPanel.cs | 4 ++-- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 2 +- .../Settings/TagsAndLayersSettings.cs | 8 ++++---- Prowl.Editor/Widgets/ContextMenuBuilder.cs | 2 +- Prowl.Editor/Widgets/EditorGUI.cs | 18 ++++++++--------- Prowl.Editor/Widgets/FileDialog.cs | 20 +++++++++---------- Prowl.Editor/Widgets/PropertyGrid.cs | 6 +++--- 17 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Prowl.Editor/EditorApplication.cs b/Prowl.Editor/EditorApplication.cs index f36016ea..edb89ad8 100644 --- a/Prowl.Editor/EditorApplication.cs +++ b/Prowl.Editor/EditorApplication.cs @@ -248,7 +248,7 @@ private void DrawTitleFlap(Paper paper, int w, int h) .Position(w - 130, 0).Size(120, EditorTheme.MenuBarHeight) .IsNotInteractable() .Text($"Prowl v{version}", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); diff --git a/Prowl.Editor/Inspector/AddComponentPopup.cs b/Prowl.Editor/Inspector/AddComponentPopup.cs index be594e40..3150f702 100644 --- a/Prowl.Editor/Inspector/AddComponentPopup.cs +++ b/Prowl.Editor/Inspector/AddComponentPopup.cs @@ -87,7 +87,7 @@ public static void Draw(Paper paper) paper.Box("acp_close") .Width(24).Height(24).Rounded(4) .Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink400) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => Close()); } @@ -120,7 +120,7 @@ public static void Draw(Paper paper) { paper.Box("acp_empty").Height(40) .Text("No matching components", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); } @@ -146,7 +146,7 @@ public static void Draw(Paper paper) paper.Box($"acp_cat_{category.GetHashCode()}") .Height(20).ChildLeft(8) .Text(category, font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft); foreach (var comp in group.OrderBy(c => c.Name)) @@ -183,7 +183,7 @@ private static void DrawComponentItem(Paper paper, Prowl.Scribe.FontFile font, s // Icon paper.Box($"{id}_ico") .Width(16).Height(EditorTheme.RowHeight) - .Text(comp.Icon, font).TextColor(EditorTheme.TextDim) + .Text(comp.Icon, font).TextColor(EditorTheme.Ink400) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); // Name diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 50a386e8..d9c1c30d 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -86,7 +86,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Width(16).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text(icon, font) - .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.TextDisabled) + .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.Ink300) .FontSize(10f).Alignment(TextAlignment.MiddleCenter); // Name @@ -94,13 +94,13 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Height(EditorTheme.RowHeight).Clip() .IsNotInteractable() .Text(displayName, font) - .TextColor(eo != null ? EditorTheme.Ink500 : EditorTheme.TextDisabled) + .TextColor(eo != null ? EditorTheme.Ink500 : EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft); // Picker circle button paper.Box($"{id}_pick") .Width(20).Height(EditorTheme.RowHeight) - .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.Ink400) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Hovered.BackgroundColor(EditorTheme.Accent).End() .Rounded(3) @@ -170,7 +170,7 @@ public static void DrawSelectorModal(Paper paper) paper.Box("eo_sel_close") .Width(24).Height(24).Rounded(4) .Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink400) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => _selectorOpen = false); } @@ -184,7 +184,7 @@ public static void DrawSelectorModal(Paper paper) .Hovered.BackgroundColor(EditorTheme.Accent).End() .Rounded(3) .Text("None", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft) .OnClick(0, (_, _) => { @@ -201,7 +201,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_bi_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.Cube} Built-In", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); for (int i = 0; i < builtInItems.Count; i++) @@ -219,7 +219,7 @@ public static void DrawSelectorModal(Paper paper) paper.Box("eo_sel_proj_hdr").Height(EditorTheme.RowHeight).ChildLeft(6) .Text($"{EditorIcons.FolderOpen} Project", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft); for (int i = 0; i < projectItems.Count; i++) @@ -234,7 +234,7 @@ public static void DrawSelectorModal(Paper paper) { paper.Box("eo_sel_empty").Height(40) .Text("No assets of this type found", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter); } } @@ -257,7 +257,7 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st { paper.Box($"{id}_ico") .Width(14).Height(EditorTheme.RowHeight) - .Text(icon, font).TextColor(EditorTheme.TextDim) + .Text(icon, font).TextColor(EditorTheme.Ink400) .FontSize(9f).Alignment(TextAlignment.MiddleCenter); paper.Box($"{id}_name") @@ -267,7 +267,7 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st paper.Box($"{id}_path") .Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildRight(4) - .Text($"({pathLabel})", font).TextColor(EditorTheme.TextDisabled) + .Text($"({pathLabel})", font).TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight); } } diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index 42faf698..1b443dd3 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -61,14 +61,14 @@ private static void DrawHeader(Paper paper, Prowl.Scribe.FontFile font, GameObje .Enter()) { paper.Box("gi_tag_lbl").Width(30).Height(22) - .Text("Tag", font).TextColor(EditorTheme.TextDim) + .Text("Tag", font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "gi_tag", "", go.Tag) .OnValueChanged(v => go.Tag = v); paper.Box("gi_layer_lbl").Width(36).Height(22) - .Text("Layer", font).TextColor(EditorTheme.TextDim) + .Text("Layer", font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "gi_layer", "", go.Layer) @@ -150,7 +150,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game paper.Box($"{compId}_label") .Height(24) .Text($"{icon} {compName}", font) - .TextColor(comp.Enabled ? EditorTheme.Ink500 : EditorTheme.TextDisabled) + .TextColor(comp.Enabled ? EditorTheme.Ink500 : EditorTheme.Ink300) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft); // Spacer @@ -160,7 +160,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game using (paper.Box($"{compId}_gear") .Width(20).Height(24).Rounded(3) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.Ink400) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .Enter()) { diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index 0c07f7cb..20a7014f 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -85,7 +85,7 @@ private static void RenderDropdown(Paper paper, string id, List items, continue; } - var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.TextDisabled; + var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink300; // Menu item row — submenu is a child so IsParentHovered keeps it open using (paper.Row($"{id}_i_{index}") diff --git a/Prowl.Editor/Panels/GameViewPanel.cs b/Prowl.Editor/Panels/GameViewPanel.cs index d111cffe..0026cdbf 100644 --- a/Prowl.Editor/Panels/GameViewPanel.cs +++ b/Prowl.Editor/Panels/GameViewPanel.cs @@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("gv_cam_count") .Width(UnitValue.Auto).Height(22).ChildLeft(4).ChildRight(4) .Text($"{EditorIcons.Camera} {camCount} camera(s)", font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight); } } @@ -86,7 +86,7 @@ private void DrawGameView(Paper paper, Prowl.Scribe.FontFile font, float width, .Size(width, height) .BackgroundColor(Color.FromArgb(255, 20, 20, 22)) .Text("No scene loaded", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter); return; } diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index cd4e7505..0d705c8b 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -62,7 +62,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("hier_empty").Height(60) .Text("No Scene Loaded", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); @@ -89,7 +89,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("hier_empty_scene").Height(40) .Text("Scene is empty", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleCenter); } @@ -293,7 +293,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_arr_{goId}") .Width(14).Height(RowHeight) .Text(isExpanded ? EditorIcons.AngleDown : EditorIcons.AngleRight, font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(goId, (id, _) => { @@ -310,7 +310,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_ico_{goId}") .Width(16).Height(RowHeight) .Text(icon, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.TextDim : EditorTheme.TextDisabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink400 : EditorTheme.Ink300) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); // Name or rename field @@ -345,7 +345,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_name_{goId}") .Height(RowHeight).ChildLeft(4) .Text(go.Name, font) - .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500 : EditorTheme.TextDisabled) + .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500 : EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } @@ -354,7 +354,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, paper.Box($"hier_vis_{goId}") .Width(18).Height(RowHeight) .Text(go.Enabled ? EditorIcons.Eye : EditorIcons.EyeSlash, font) - .TextColor(go.Enabled ? EditorTheme.TextDim : EditorTheme.TextDisabled) + .TextColor(go.Enabled ? EditorTheme.Ink400 : EditorTheme.Ink300) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .StopEventPropagation() .OnClick(go, (g, _) => g.Enabled = !g.Enabled); diff --git a/Prowl.Editor/Panels/InspectorPanel.cs b/Prowl.Editor/Panels/InspectorPanel.cs index 1e583dad..654b7fbc 100644 --- a/Prowl.Editor/Panels/InspectorPanel.cs +++ b/Prowl.Editor/Panels/InspectorPanel.cs @@ -89,13 +89,13 @@ private void DrawEmpty(Paper paper, Prowl.Scribe.FontFile font, float width) { paper.Box("insp_empty").Height(80) .Text("Nothing Selected", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); paper.Box("insp_hint").Height(30) .Text("Select an asset or object to inspect it.", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 4) .Alignment(TextAlignment.MiddleCenter); } @@ -151,7 +151,7 @@ private void DrawSelectionHeader(Paper paper, Prowl.Scribe.FontFile font, object paper.Box("insp_h_type") .Height(14) .Text(typeName, font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 4) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index c6671353..25401f2e 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -69,7 +69,7 @@ private void DrawTabBtn(Paper paper, Prowl.Scribe.FontFile font, string label, s .BackgroundColor(sel ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(sel ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {label}", font) - .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.TextDim) + .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(tab, (t, _) => _tab = t); diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index 147a3777..7a0bbfad 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -25,7 +25,7 @@ public override void OnGUI(Paper paper, float width, float height) { paper.Box("ps_empty").Size(width, height) .Text("No settings registered", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); return; @@ -61,7 +61,7 @@ public override void OnGUI(Paper paper, float width, float height) .BackgroundColor(isSelected ? EditorTheme.Accent : Color.Transparent) .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() .Text($"{icon} {entry.Name}", font) - .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.TextDim) + .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft) .OnClick(idx, (id, _) => _selectedIndex = id); diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index f7c5b66a..d383819a 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -114,7 +114,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) // paper.Box("sv_cam_info") // .Width(UnitValue.Auto).Height(24) // .ChildLeft(4).ChildRight(4) - // .Text(info, font).TextColor(EditorTheme.TextDim) + // .Text(info, font).TextColor(EditorTheme.Ink400) // .FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight); //} } @@ -144,7 +144,7 @@ private void DrawViewport(Paper paper, Prowl.Scribe.FontFile font, float width, paper.Box("sv_no_scene_text") .Height(30) .Text("No Scene Loaded", font) - .TextColor(EditorTheme.TextDisabled) + .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize) .Alignment(TextAlignment.MiddleCenter); diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index 78caab22..d56a7c50 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -340,7 +340,7 @@ public override void OnGUI(Paper paper, float width, float height) paper.Box("ctx_hint") .IsNotInteractable() .Text("Right-click here for a context menu", EditorTheme.DefaultFont) - .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize); + .TextColor(EditorTheme.Ink400).FontSize(EditorTheme.FontSize); ContextMenuHelper.RightClickMenu(paper, "ctx_test", menu => { diff --git a/Prowl.Editor/Settings/TagsAndLayersSettings.cs b/Prowl.Editor/Settings/TagsAndLayersSettings.cs index f0bc016f..68aaf759 100644 --- a/Prowl.Editor/Settings/TagsAndLayersSettings.cs +++ b/Prowl.Editor/Settings/TagsAndLayersSettings.cs @@ -48,7 +48,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_name_{i}") .Height(22).ChildLeft(4) .Text(Tags[i], font) - .TextColor(isBuiltin ? EditorTheme.TextDim : EditorTheme.Ink500) + .TextColor(isBuiltin ? EditorTheme.Ink400 : EditorTheme.Ink500) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); @@ -57,7 +57,7 @@ public override void OnGUI(Paper paper, float width) paper.Box($"tl_tag_del_{i}") .Width(20).Height(22).Rounded(3) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim) + .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink400) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(idx, (id, _) => { @@ -98,13 +98,13 @@ public override void OnGUI(Paper paper, float width) { paper.Box($"tl_layer_idx_{i}") .Width(24).Height(22) - .Text(i.ToString(), font).TextColor(EditorTheme.TextDim) + .Text(i.ToString(), font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); paper.Box($"tl_layer_name_{i}") .Height(22).ChildLeft(4) - .Text(Layers[i], font).TextColor(EditorTheme.TextDim) + .Text(Layers[i], font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) .Alignment(TextAlignment.MiddleLeft); } diff --git a/Prowl.Editor/Widgets/ContextMenuBuilder.cs b/Prowl.Editor/Widgets/ContextMenuBuilder.cs index 58144e8c..a44c0fdb 100644 --- a/Prowl.Editor/Widgets/ContextMenuBuilder.cs +++ b/Prowl.Editor/Widgets/ContextMenuBuilder.cs @@ -72,7 +72,7 @@ public void Render(Paper paper, string id, float x, float y) continue; } - var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.TextDisabled; + var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink300; using (paper.Row($"{id}_i_{i}") .Height(EditorTheme.RowHeight) diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index d5f76c50..c8c521ae 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -33,7 +33,7 @@ private static ElementBuilder.TextInputSettings MakeNumericSettings(Func TextField(Paper paper, string id, string labe onChange: v => userCallback?.Invoke(v), textColor: EditorTheme.Ink500, placeholder: "", - placeholderColor: EditorTheme.TextDisabled, + placeholderColor: EditorTheme.Ink300, intID: id.GetHashCode()); } } @@ -455,7 +455,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .MaxWidth(16) // .Text("\u25BC", Font) .Text(EditorIcons.ChevronDown, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(FontSz * 0.7f); } else @@ -465,7 +465,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .Width(16) .MaxWidth(16) .Text(EditorIcons.ChevronRight, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(FontSz * 0.7f); } paper.Box($"{id}_header_lbl") @@ -548,7 +548,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .MaxWidth(16) // .Text("\u25BC", Font) .Text(EditorIcons.ChevronUp, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(FontSz * 0.7f); } else @@ -559,7 +559,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .MaxWidth(16) // .Text("\u25B6", Font) .Text(EditorIcons.ChevronDown, Font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(FontSz * 0.7f); } } @@ -666,7 +666,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu paper.Box($"{id}_icon") .Width(16) .Margin(EditorTheme.RowHeight / 4, 0, EditorTheme.RowHeight / 8, 0) - .Text(EditorIcons.MagnifyingGlass, Font).TextColor(EditorTheme.TextDim).FontSize(FontSz * 0.7f); + .Text(EditorIcons.MagnifyingGlass, Font).TextColor(EditorTheme.Ink400).FontSize(FontSz * 0.7f); paper.Box($"{id}_tf") .Height(EditorTheme.RowHeight) @@ -679,7 +679,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu onChange: v => userCallback?.Invoke(v), textColor: EditorTheme.Ink500, placeholder: placeholder, - placeholderColor: EditorTheme.TextDisabled, + placeholderColor: EditorTheme.Ink300, intID: id.GetHashCode()); if (!string.IsNullOrEmpty(value)) @@ -688,7 +688,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .Rounded(8) .Size(16).Margin(2, UnitValue.StretchOne) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.TextDim).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) + .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.Ink400).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) .OnClick(e => userCallback?.Invoke("")); } } diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index eda366aa..4658bf7c 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -276,7 +276,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) float btnW = 28f; // Back - var backColor = _historyIndex > 0 ? EditorTheme.Ink500 : EditorTheme.TextDisabled; + var backColor = _historyIndex > 0 ? EditorTheme.Ink500 : EditorTheme.Ink300; paper.Box("fd_back").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowLeft, font).TextColor(backColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -285,7 +285,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) .OnClick(0, (_, _) => NavigateBack()); // Forward - var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Ink500 : EditorTheme.TextDisabled; + var fwdColor = _historyIndex < _pathHistory.Count - 1 ? EditorTheme.Ink500 : EditorTheme.Ink300; paper.Box("fd_fwd").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowRight, font).TextColor(fwdColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) @@ -353,7 +353,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) { // Quick access paper.Box("fd_qa_label").Height(20) - .Text("Quick Access", font).TextColor(EditorTheme.TextDim) + .Text("Quick Access", font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft) .ChildLeft(8); @@ -377,7 +377,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) // Drives paper.Box("fd_drv_label").Height(20) - .Text("Drives", font).TextColor(EditorTheme.TextDim) + .Text("Drives", font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft) .ChildLeft(8); @@ -416,7 +416,7 @@ void ColHeader(string id, string label, int col, float? width = null) if (width.HasValue) el.Width(width.Value); el.ChildLeft(8) .Text(label + (_sortColumn == col ? (_sortAscending ? " \u25B4" : " \u25BE") : ""), font) - .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize - 3) + .TextColor(EditorTheme.Ink400).FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .OnClick(col, (c, _) => @@ -508,7 +508,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) { // Icon + Name string icon = entry.IsDirectory ? EditorIcons.Folder : GetFileIcon(entry.Name); - var iconColor = entry.IsDirectory ? Color.FromArgb(255, 220, 180, 80) : EditorTheme.TextDim; + var iconColor = entry.IsDirectory ? Color.FromArgb(255, 220, 180, 80) : EditorTheme.Ink400; paper.Box($"fd_ico_{i}").Width(20).Height(RowHeight) .Text(icon, font).TextColor(iconColor) @@ -522,14 +522,14 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) // Size string sizeText = entry.IsDirectory ? "" : FormatSize(entry.Size); paper.Box($"fd_size_{i}").Width(80).Height(RowHeight) - .Text(sizeText, font).TextColor(EditorTheme.TextDim) + .Text(sizeText, font).TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight) .ChildRight(8); // Date paper.Box($"fd_date_{i}").Width(140).Height(RowHeight) .Text(entry.LastModified.ToString("yyyy-MM-dd HH:mm"), font) - .TextColor(EditorTheme.TextDim) + .TextColor(EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight) .ChildRight(8); } @@ -538,7 +538,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) if (displayEntries.Count == 0) { paper.Box("fd_empty").Height(60) - .Text("This folder is empty", font).TextColor(EditorTheme.TextDisabled) + .Text("This folder is empty", font).TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter); } } @@ -559,7 +559,7 @@ private static void DrawBottomBar(Paper paper, Prowl.Scribe.FontFile font) { paper.Box("fd_name_lbl").Width(70).Height(24) .Text(_mode == FileDialogMode.SelectFolder ? "Folder:" : "File name:", font) - .TextColor(EditorTheme.TextDim).FontSize(EditorTheme.FontSize - 2) + .TextColor(EditorTheme.Ink400).FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleRight); EditorGUI.TextField(paper, "fd_filename", "", _fileName) diff --git a/Prowl.Editor/Widgets/PropertyGrid.cs b/Prowl.Editor/Widgets/PropertyGrid.cs index d6eec800..af6e1c53 100644 --- a/Prowl.Editor/Widgets/PropertyGrid.cs +++ b/Prowl.Editor/Widgets/PropertyGrid.cs @@ -29,7 +29,7 @@ public static void Draw(Paper paper, string id, object target, Action? o { if (target == null) return; - if (depth > 10) { EditorGUI.Label(paper, $"{id}_deep", "(max depth)", EditorTheme.TextDim); return; } + if (depth > 10) { EditorGUI.Label(paper, $"{id}_deep", "(max depth)", EditorTheme.Ink400); return; } var type = target.GetType(); var fields = GetSerializableFields(type); @@ -150,7 +150,7 @@ public static void DrawField(Paper paper, string id, string label, Type type, ob } // 7. Fallback - EditorGUI.Label(paper, id, $"{label}: {value ?? "(null)"}", EditorTheme.TextDim); + EditorGUI.Label(paper, id, $"{label}: {value ?? "(null)"}", EditorTheme.Ink400); } // ================================================================ @@ -213,7 +213,7 @@ static void DrawTypePicker(Paper paper, string id, Type baseType, object? curren if (types.Length == 0) { - EditorGUI.Label(paper, $"{id}_none", "(no implementations)", EditorTheme.TextDim); + EditorGUI.Label(paper, $"{id}_none", "(no implementations)", EditorTheme.Ink400); return; } From bfcaec7c3b9ba03e388db0808d5a05ae004df064 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:19:04 -0400 Subject: [PATCH 08/26] commented out unused theme colors --- Prowl.Editor/EditorTheme.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index 1e3a060b..8da2b005 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -42,14 +42,14 @@ public static class EditorTheme // public static Color MenuBarBackground => Darkest; // public static Color WindowBackground => Normal; // public static Color PanelBackground => Normal; - public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); - public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); + // public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); + // public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); // public static Color Border => Bright; // Text - public static Color Text = Color.FromArgb(255, 220, 220, 220); - public static Color TextDim = Color.FromArgb(255, 150, 150, 150); - public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); + // public static Color Text = Color.FromArgb(255, 220, 220, 220); + // public static Color TextDim = Color.FromArgb(255, 150, 150, 150); + // public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); // Interactive public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); From 7008a14edf2f8a74fa91f5890673e5309719927e Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:20:54 -0400 Subject: [PATCH 09/26] Replace Accent with Purple400, Replace AccentDim with Purple300 --- Prowl.Editor/DragDrop.cs | 2 +- Prowl.Editor/Inspector/AddComponentPopup.cs | 2 +- .../Inspector/EngineObjectPropertyEditor.cs | 12 ++++---- Prowl.Editor/MainMenuBar.cs | 2 +- Prowl.Editor/Panels/HierarchyPanel.cs | 14 +++++----- Prowl.Editor/Panels/InspectorPanel.cs | 2 +- Prowl.Editor/Panels/PreferencesPanel.cs | 4 +-- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 4 +-- Prowl.Editor/Panels/SceneViewPanel.cs | 12 ++++---- Prowl.Editor/Widgets/ColorPicker.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 6 ++-- Prowl.Editor/Widgets/EditorGUI.cs | 28 +++++++++---------- Prowl.Editor/Widgets/FileDialog.cs | 14 +++++----- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Prowl.Editor/DragDrop.cs b/Prowl.Editor/DragDrop.cs index 03dc6494..01df188f 100644 --- a/Prowl.Editor/DragDrop.cs +++ b/Prowl.Editor/DragDrop.cs @@ -134,7 +134,7 @@ public static void DrawVisual(Paper paper) .Position((float)DragPosition.X + 12, (float)DragPosition.Y + 4) .Width(UnitValue.Auto).Height(22) .BackgroundColor(System.Drawing.Color.FromArgb(200, 40, 40, 45)) - .BorderColor(EditorTheme.Accent).BorderWidth(1) + .BorderColor(EditorTheme.Purple400).BorderWidth(1) .Rounded(4).ChildLeft(6).ChildRight(6) .IsNotInteractable() .Layer(Layer.Topmost) diff --git a/Prowl.Editor/Inspector/AddComponentPopup.cs b/Prowl.Editor/Inspector/AddComponentPopup.cs index 3150f702..38c27965 100644 --- a/Prowl.Editor/Inspector/AddComponentPopup.cs +++ b/Prowl.Editor/Inspector/AddComponentPopup.cs @@ -168,7 +168,7 @@ private static void DrawComponentItem(Paper paper, Prowl.Scribe.FontFile font, s { using (paper.Row(id) .Height(EditorTheme.RowHeight) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .Rounded(3).ChildLeft(8).RowBetween(6) .OnClick(comp.Type, (type, _) => { diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index d9c1c30d..9032bc07 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -54,10 +54,10 @@ public override void OnGUI(Paper paper, string id, string label, object? value, // Object field row var fieldEl = paper.Row($"{id}_field") .Height(EditorTheme.RowHeight) - .BackgroundColor(isDragTarget ? System.Drawing.Color.FromArgb(60, EditorTheme.Accent) : EditorTheme.Neutral300) + .BackgroundColor(isDragTarget ? System.Drawing.Color.FromArgb(60, EditorTheme.Purple400) : EditorTheme.Neutral300) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3).ChildLeft(4).ChildRight(2).RowBetween(2) - .BorderColor(isDragTarget ? EditorTheme.Accent : EditorTheme.Ink200).BorderWidth(1) + .BorderColor(isDragTarget ? EditorTheme.Purple400 : EditorTheme.Ink200).BorderWidth(1) .OnDoubleClick((fieldType, onChange), (cap, _) => OpenSelector(cap.Item1, cap.Item2)); using (fieldEl.Enter()) @@ -86,7 +86,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Width(16).Height(EditorTheme.RowHeight) .IsNotInteractable() .Text(icon, font) - .TextColor(eo != null ? EditorTheme.Accent : EditorTheme.Ink300) + .TextColor(eo != null ? EditorTheme.Purple400 : EditorTheme.Ink300) .FontSize(10f).Alignment(TextAlignment.MiddleCenter); // Name @@ -102,7 +102,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, .Width(20).Height(EditorTheme.RowHeight) .Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.Ink400) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .Rounded(3) .OnClick((fieldType, onChange), (cap, _) => OpenSelector(cap.Item1, cap.Item2)); } @@ -181,7 +181,7 @@ public static void DrawSelectorModal(Paper paper) // None option paper.Box("eo_sel_none") .Height(EditorTheme.RowHeight).ChildLeft(8) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .Rounded(3) .Text("None", font) .TextColor(EditorTheme.Ink400) @@ -245,7 +245,7 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st { using (paper.Row(id) .Height(EditorTheme.RowHeight).ChildLeft(12).RowBetween(4) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .Rounded(3) .OnClick(guid, (g, _) => { diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index 20a7014f..389f5145 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -92,7 +92,7 @@ private static void RenderDropdown(Paper paper, string id, List items, .Height(ItemHeight) .BackgroundColor(Color.Transparent) .Rounded(3) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .OnClick(item, (captured, e) => { if (captured.IsEnabled && captured.OnClick != null) diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index 0d705c8b..0fb9aa7e 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -171,10 +171,10 @@ public override void OnGUI(Paper paper, float width, float height) if (DragDrop.IsDraggingType() && paper.IsParentHovered) { paper.Box("hier_drop_zone").Height(24) - .BackgroundColor(Color.FromArgb(40, EditorTheme.Accent)) + .BackgroundColor(Color.FromArgb(40, EditorTheme.Purple400)) .Rounded(3) .Text("Drop to spawn here", font) - .TextColor(EditorTheme.Accent) + .TextColor(EditorTheme.Purple400) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleCenter); } @@ -260,15 +260,15 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, { paper.Box($"hier_drop_above_{goId}") .Height(2).ChildLeft(indent) - .BackgroundColor(EditorTheme.Accent); + .BackgroundColor(EditorTheme.Purple400); } using (paper.Row($"hier_go_{goId}") .Height(RowHeight) - .BackgroundColor(isSelected ? EditorTheme.Accent : + .BackgroundColor(isSelected ? EditorTheme.Purple400 : (_dropTargetId == goId && _dropPos == DropPosition.Into) - ? Color.FromArgb(60, EditorTheme.Accent) : Color.Transparent) - .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() + ? Color.FromArgb(60, EditorTheme.Purple400) : Color.Transparent) + .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() .Rounded(2) .ChildLeft(indent + 2) .OnClick((go, currentIndex, flatList), (cap, e) => @@ -368,7 +368,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, { paper.Box($"hier_drop_below_{goId}") .Height(2).ChildLeft(indent) - .BackgroundColor(EditorTheme.Accent); + .BackgroundColor(EditorTheme.Purple400); } // Draw children diff --git a/Prowl.Editor/Panels/InspectorPanel.cs b/Prowl.Editor/Panels/InspectorPanel.cs index 654b7fbc..259c5d61 100644 --- a/Prowl.Editor/Panels/InspectorPanel.cs +++ b/Prowl.Editor/Panels/InspectorPanel.cs @@ -135,7 +135,7 @@ private void DrawSelectionHeader(Paper paper, Prowl.Scribe.FontFile font, object .BackgroundColor(Color.FromArgb(30, 255, 255, 255)) .Rounded(6) .Text(icon, font) - .TextColor(EditorTheme.Accent) + .TextColor(EditorTheme.Purple400) .FontSize(18f) .Alignment(TextAlignment.MiddleCenter); diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index 25401f2e..b7f05de0 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -66,8 +66,8 @@ private void DrawTabBtn(Paper paper, Prowl.Scribe.FontFile font, string label, s bool sel = _tab == tab; paper.Box($"pref_tab_{tab}") .Height(26).ChildLeft(8).Rounded(3) - .BackgroundColor(sel ? EditorTheme.Accent : Color.Transparent) - .Hovered.BackgroundColor(sel ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() + .BackgroundColor(sel ? EditorTheme.Purple400 : Color.Transparent) + .Hovered.BackgroundColor(sel ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() .Text($"{icon} {label}", font) .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index 7a0bbfad..3d6b78a5 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -58,8 +58,8 @@ public override void OnGUI(Paper paper, float width, float height) paper.Box($"ps_cat_{i}") .Height(26).ChildLeft(8).Rounded(3) - .BackgroundColor(isSelected ? EditorTheme.Accent : Color.Transparent) - .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() + .BackgroundColor(isSelected ? EditorTheme.Purple400 : Color.Transparent) + .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() .Text($"{icon} {entry.Name}", font) .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index d383819a..45a3ec3c 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -61,7 +61,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_move_btn") .Width(24).Height(24).Rounded(4) - .BackgroundColor(isTranslate ? EditorTheme.Accent : Color.Transparent) + .BackgroundColor(isTranslate ? EditorTheme.Purple400 : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) @@ -69,7 +69,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_rotate_btn") .Width(24).Height(24).Rounded(4) - .BackgroundColor(isRotate ? EditorTheme.Accent : Color.Transparent) + .BackgroundColor(isRotate ? EditorTheme.Purple400 : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) @@ -77,7 +77,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_scale_btn") .Width(24).Height(24).Rounded(4) - .BackgroundColor(isScale ? EditorTheme.Accent : Color.Transparent) + .BackgroundColor(isScale ? EditorTheme.Purple400 : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) @@ -85,7 +85,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_universal_btn") .Width(24).Height(24).Rounded(4) - .BackgroundColor(isUniversal ? EditorTheme.Accent : Color.Transparent) + .BackgroundColor(isUniversal ? EditorTheme.Purple400 : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) @@ -97,7 +97,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) bool showGrid = _editorCamera?.ShowGrid ?? true; paper.Box("sv_grid_btn") .Width(24).Height(24).Rounded(4) - .BackgroundColor(showGrid ? EditorTheme.Accent : Color.Transparent) + .BackgroundColor(showGrid ? EditorTheme.Purple400 : Color.Transparent) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) @@ -237,7 +237,7 @@ private void DrawViewport(Paper paper, Prowl.Scribe.FontFile font, float width, .BackgroundColor(Color.FromArgb(150, 30, 30, 35)) .IsNotInteractable() .Text($"{EditorIcons.ArrowDown} Drop to spawn in scene", font) - .TextColor(EditorTheme.Accent) + .TextColor(EditorTheme.Purple400) .FontSize(EditorTheme.FontSize - 2) .Alignment(TextAlignment.MiddleCenter); } diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index 4a7fd2c1..ca04919b 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -125,7 +125,7 @@ static void DrawPalette(Paper paper, string id, ElementHandle el, FontFile? font .BackgroundColor(sc) .Rounded(2) .BorderColor(EditorTheme.Ink200).BorderWidth(1) - .Hovered.BorderColor(EditorTheme.Accent).End() + .Hovered.BorderColor(EditorTheme.Purple400).End() .OnClick(idx, (ci, _) => { var c = ColorRamp.ParseHex(palette[ci]); diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index dbdf91e3..44dd7d97 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -39,7 +39,7 @@ public static WidgetResult CurveField(Paper paper, string id, st .Height(40).Width(UnitValue.Stretch()) .BackgroundColor(EditorTheme.Neutral300) .Rounded(3).BorderColor(EditorTheme.Ink200).BorderWidth(1) - .Hovered.BorderColor(EditorTheme.Accent).End() + .Hovered.BorderColor(EditorTheme.Purple400).End() .Enter()) { bool isOpen = paper.IsParentFocusWithin; @@ -252,7 +252,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< .PositionType(PositionType.SelfDirected) .Position(kx - 5, ky - 5).Size(10, 10) .BackgroundColor(isSelected ? Color.FromArgb(255, 255, 200, 50) : Color.FromArgb(255, 255, 255, 255)) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .Rounded(5) .StopEventPropagation() .Tooltip($"({key.Position:F2}, {key.Value:F2})") @@ -385,7 +385,7 @@ static void DrawCurvePalette(Paper paper, string id, AnimationCurve curve, .BackgroundColor(EditorTheme.Neutral300) .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) - .Hovered.BorderColor(EditorTheme.Accent).End() + .Hovered.BorderColor(EditorTheme.Purple400).End() .Tooltip(preset.Name) .OnClick(idx, (ci, _) => { diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index c8c521ae..55bf8ea4 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -164,8 +164,8 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo { var box = paper.Box($"{id}_box") .Size(16, 16) - .BackgroundColor(value ? EditorTheme.Accent : EditorTheme.Neutral300) - .Hovered.BackgroundColor(value ? EditorTheme.AccentDim : EditorTheme.ButtonHovered).End() + .BackgroundColor(value ? EditorTheme.Purple400 : EditorTheme.Neutral300) + .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.ButtonHovered).End() .Rounded(3) .Alignment(PaperUI.TextAlignment.MiddleCenter) .BorderColor(EditorTheme.Ink200).BorderWidth(1); @@ -209,7 +209,7 @@ public static WidgetResult TextField(Paper paper, string id, string labe .BackgroundColor(EditorTheme.Neutral200) .BorderColor(EditorTheme.Neutral100) - .Focused.BorderColor(EditorTheme.Accent).End() + .Focused.BorderColor(EditorTheme.Purple400).End() .TabIndex(0) .Enter()) @@ -261,7 +261,7 @@ public static WidgetResult FloatField(Paper paper, string id, float value .BackgroundColor(EditorTheme.Neutral200) .BorderColor(EditorTheme.Neutral100) - .Focused.BorderColor(EditorTheme.Accent).End() + .Focused.BorderColor(EditorTheme.Purple400).End() .TabIndex(0) .Enter()) @@ -317,7 +317,7 @@ public static WidgetResult IntField(Paper paper, string id, int value, stri .BackgroundColor(EditorTheme.Neutral200) .BorderColor(EditorTheme.Neutral100) - .Focused.BorderColor(EditorTheme.Accent).End() + .Focused.BorderColor(EditorTheme.Purple400).End() .TabIndex(0) .Enter()) @@ -404,7 +404,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f if (t > 0f) { canvas.RoundedRectFilled(rx, trackY, rw * t, trackH, trackR, trackR, trackR, trackR, - EditorTheme.Accent); + EditorTheme.Purple400); } // ── Thumb body ──────────────────────────────────────── @@ -511,7 +511,7 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i .BackgroundColor(EditorTheme.Neutral200) .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) - .Hovered.BorderColor(EditorTheme.Accent).End() + .Hovered.BorderColor(EditorTheme.Purple400).End() .ChildLeft(6).ChildRight(6) .OnClick(e => { @@ -589,8 +589,8 @@ public static WidgetResult Dropdown(Paper paper, string id, string label, i var opt = paper.Box($"{id}_o_{i}") .Height(EditorTheme.RowHeight) .ChildLeft(6) - .BackgroundColor(isSel ? EditorTheme.AccentDim : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.Accent).End() + .BackgroundColor(isSel ? EditorTheme.Purple300 : Color.Transparent) + .Hovered.BackgroundColor(EditorTheme.Purple400).End() .Rounded(3) .HookToParent() .OnClick(e => @@ -621,8 +621,8 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab using (paper.Box(id) .Height(EditorTheme.RowHeight) .ChildLeft(EditorTheme.RowHeight/4).ChildRight(EditorTheme.RowHeight/4) - .BackgroundColor(value ? EditorTheme.Accent : EditorTheme.ButtonNormal) - .Hovered.BackgroundColor(value ? EditorTheme.AccentDim : EditorTheme.ButtonHovered).End() + .BackgroundColor(value ? EditorTheme.Purple400 : EditorTheme.ButtonNormal) + .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) @@ -655,7 +655,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu .BackgroundColor(EditorTheme.Neutral200) .BorderColor(EditorTheme.Neutral100) - .Focused.BorderColor(EditorTheme.Accent).End() + .Focused.BorderColor(EditorTheme.Purple400).End() .ChildLeft(6).ChildRight(4) .RowBetween(4) @@ -870,7 +870,7 @@ public static WidgetResult IntSlider(Paper paper, string id, string label, (int)(value.B * 255))) .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) - .Hovered.BorderColor(EditorTheme.Accent).End() + .Hovered.BorderColor(EditorTheme.Purple400).End() .Enter()) { bool isOpen = paper.IsParentFocusWithin; @@ -949,7 +949,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr // ── Track fill ──────────────────────────────────────── if (progress > 0f) canvas.RoundedRectFilled(rx, trackY, rw * progress, trackH, trackR, trackR, trackR, trackR, - EditorTheme.Accent); + EditorTheme.Purple400); })); if (Font != null) diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 4658bf7c..06ac9446 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -362,8 +362,8 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) string qPath = pathFn(); bool isCurrent = _currentPath.Equals(qPath, StringComparison.OrdinalIgnoreCase); paper.Box($"fd_qa_{label}").Height(24) - .BackgroundColor(isCurrent ? EditorTheme.Accent : Color.Transparent) - .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() + .BackgroundColor(isCurrent ? EditorTheme.Purple400 : Color.Transparent) + .Hovered.BackgroundColor(isCurrent ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) .Text($"{icon} {label}", font).TextColor(EditorTheme.Ink500) @@ -389,8 +389,8 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) string dLabel = $"{EditorIcons.HardDrive} {dName}"; bool isCurrent = _currentPath.StartsWith(dName, StringComparison.OrdinalIgnoreCase); paper.Box($"fd_drv_{dName}").Height(24) - .BackgroundColor(isCurrent ? EditorTheme.Accent : Color.Transparent) - .Hovered.BackgroundColor(isCurrent ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() + .BackgroundColor(isCurrent ? EditorTheme.Purple400 : Color.Transparent) + .Hovered.BackgroundColor(isCurrent ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() .Rounded(4) .ChildLeft(8) .Text(dLabel, font).TextColor(EditorTheme.Ink500) @@ -445,7 +445,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) { using (paper.Row("fd_newfolder_row") .Height(RowHeight) - .BackgroundColor(EditorTheme.Accent) + .BackgroundColor(EditorTheme.Purple400) .ChildLeft(8).RowBetween(8) .Enter()) { @@ -487,8 +487,8 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) using (paper.Row($"fd_row_{i}") .Height(RowHeight) - .BackgroundColor(isSelected ? EditorTheme.Accent : (i % 2 == 0 ? Color.Transparent : Color.FromArgb(15, 255, 255, 255))) - .Hovered.BackgroundColor(isSelected ? EditorTheme.Accent : EditorTheme.ButtonHovered).End() + .BackgroundColor(isSelected ? EditorTheme.Purple400 : (i % 2 == 0 ? Color.Transparent : Color.FromArgb(15, 255, 255, 255))) + .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() .ChildLeft(8).RowBetween(0) .OnClick(entry, (e, ev) => { From d312678e811f48dab6ff829b4808a50cf0576029 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:21:12 -0400 Subject: [PATCH 10/26] commented out old accent theme colors --- Prowl.Editor/EditorTheme.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index 8da2b005..f8a01e16 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -57,8 +57,8 @@ public static class EditorTheme public static Color ButtonActive = Color.FromArgb(255, 40, 40, 43); // Accent - public static Color Accent = Color.FromArgb(255, 51, 122, 183); - public static Color AccentDim = Color.FromArgb(255, 40, 90, 140); + // public static Color Accent = Color.FromArgb(255, 51, 122, 183); + // public static Color AccentDim = Color.FromArgb(255, 40, 90, 140); // Borders // public static Color BorderFocused = Color.FromArgb(255, 51, 122, 183); From cd5907d5003a6b19c7a65e55e2f7c7648c201235 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:42:09 -0400 Subject: [PATCH 11/26] Replace ButtonNormal with Ink100 --- Prowl.Editor/EditorTheme.cs | 2 +- Prowl.Editor/Inspector/GameObjectInspector.cs | 2 +- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 2 +- Prowl.Editor/Widgets/ColorPicker.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 4 ++-- Prowl.Editor/Widgets/EditorGUI.cs | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index f8a01e16..bf4c681a 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -52,7 +52,7 @@ public static class EditorTheme // public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); // Interactive - public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); + // public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); public static Color ButtonHovered = Color.FromArgb(255, 70, 70, 74); public static Color ButtonActive = Color.FromArgb(255, 40, 40, 43); diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index 1b443dd3..934a4655 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -249,7 +249,7 @@ private static void DrawAddComponentButton(Paper paper, Prowl.Scribe.FontFile fo { paper.Box("gi_add_comp") .Height(28).Rounded(4) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Text($"{EditorIcons.Plus} Add Component", font) .TextColor(EditorTheme.Ink500) diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index d56a7c50..de6e6534 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -400,7 +400,7 @@ public override void OnGUI(Paper paper, float width, float height) var tooltipBtn = paper.Box("tooltip_demo") .Height(EditorTheme.RowHeight) .Width(200) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index ca04919b..85d26313 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -144,7 +144,7 @@ static void DrawPalette(Paper paper, string id, ElementHandle el, FontFile? font // Add button paper.Box($"{id}_add") .Size(swatchSize, swatchSize) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Rounded(2) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index 44dd7d97..d21b5952 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -294,7 +294,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< { var fitBtn = paper.Box($"{id}_fit") .Height(22).ChildLeft(6).ChildRight(6) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3) .OnClick(e => @@ -312,7 +312,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< // Save current curve to palette var saveBtn = paper.Box($"{id}_save_preset") .Height(22).ChildLeft(6).ChildRight(6) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Rounded(3) .OnClick(e => diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index 55bf8ea4..e5b488c7 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -104,7 +104,7 @@ public static WidgetResult Button(Paper paper, string id, string label, fl var el = paper.Box(id) .Height(EditorTheme.RowHeight) .ChildLeft(EditorTheme.RowHeight/4).ChildRight(EditorTheme.RowHeight/4) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) @@ -136,7 +136,7 @@ public static WidgetResult ButtonSquare(Paper paper, string id, string ico .FontSize(FontSz) .Height(EditorTheme.RowHeight) .Width(EditorTheme.RowHeight) - .BackgroundColor(EditorTheme.ButtonNormal) + .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) @@ -398,7 +398,7 @@ public static WidgetResult Slider(Paper paper, string id, string label, f // ── Track background ────────────────────────────────── canvas.RoundedRectFilled(rx, trackY, rw, trackH, trackR, trackR, trackR, trackR, - EditorTheme.ButtonNormal); + EditorTheme.Ink100); // ── Track fill ──────────────────────────────────────── if (t > 0f) @@ -621,7 +621,7 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab using (paper.Box(id) .Height(EditorTheme.RowHeight) .ChildLeft(EditorTheme.RowHeight/4).ChildRight(EditorTheme.RowHeight/4) - .BackgroundColor(value ? EditorTheme.Purple400 : EditorTheme.ButtonNormal) + .BackgroundColor(value ? EditorTheme.Purple400 : EditorTheme.Ink100) .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.ButtonHovered).End() .Active.BackgroundColor(EditorTheme.ButtonActive).End() .Rounded(3) @@ -944,7 +944,7 @@ public static void ProgressBar(Paper paper, string id, string label, float progr // ── Track background ────────────────────────────────── canvas.RoundedRectFilled(rx, trackY, rw, trackH, trackR, trackR, trackR, trackR, - EditorTheme.ButtonNormal); + EditorTheme.Ink100); // ── Track fill ──────────────────────────────────────── if (progress > 0f) From f4fe64eca039467d621bcc198ec2c07bb6729ce6 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:43:30 -0400 Subject: [PATCH 12/26] Replace ButtonHovered with Ink200 --- Prowl.Editor/EditorTheme.cs | 2 +- .../Inspector/EngineObjectPropertyEditor.cs | 2 +- Prowl.Editor/Inspector/GameObjectInspector.cs | 4 ++-- Prowl.Editor/MainMenuBar.cs | 2 +- Prowl.Editor/Panels/HierarchyPanel.cs | 4 ++-- Prowl.Editor/Panels/PreferencesPanel.cs | 2 +- Prowl.Editor/Panels/ProjectSettingsPanel.cs | 2 +- Prowl.Editor/Panels/SceneViewPanel.cs | 10 +++++----- Prowl.Editor/Panels/WidgetPlaygroundPanel.cs | 2 +- Prowl.Editor/Settings/TagsAndLayersSettings.cs | 2 +- Prowl.Editor/Widgets/ColorPicker.cs | 2 +- Prowl.Editor/Widgets/CurveEditor.cs | 4 ++-- Prowl.Editor/Widgets/EditorGUI.cs | 15 ++++++--------- Prowl.Editor/Widgets/FileDialog.cs | 16 ++++++++-------- 14 files changed, 33 insertions(+), 36 deletions(-) diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index bf4c681a..a8358db6 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -53,7 +53,7 @@ public static class EditorTheme // Interactive // public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); - public static Color ButtonHovered = Color.FromArgb(255, 70, 70, 74); + // public static Color ButtonHovered = Color.FromArgb(255, 70, 70, 74); public static Color ButtonActive = Color.FromArgb(255, 40, 40, 43); // Accent diff --git a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs index 9032bc07..cd5f868b 100644 --- a/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs +++ b/Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs @@ -55,7 +55,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value, var fieldEl = paper.Row($"{id}_field") .Height(EditorTheme.RowHeight) .BackgroundColor(isDragTarget ? System.Drawing.Color.FromArgb(60, EditorTheme.Purple400) : EditorTheme.Neutral300) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3).ChildLeft(4).ChildRight(2).RowBetween(2) .BorderColor(isDragTarget ? EditorTheme.Purple400 : EditorTheme.Ink200).BorderWidth(1) .OnDoubleClick((fieldType, onChange), (cap, _) => OpenSelector(cap.Item1, cap.Item2)); diff --git a/Prowl.Editor/Inspector/GameObjectInspector.cs b/Prowl.Editor/Inspector/GameObjectInspector.cs index 934a4655..cd602d18 100644 --- a/Prowl.Editor/Inspector/GameObjectInspector.cs +++ b/Prowl.Editor/Inspector/GameObjectInspector.cs @@ -159,7 +159,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game // Context menu button using (paper.Box($"{compId}_gear") .Width(20).Height(24).Rounded(3) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.Ink400) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .Enter()) @@ -250,7 +250,7 @@ private static void DrawAddComponentButton(Paper paper, Prowl.Scribe.FontFile fo paper.Box("gi_add_comp") .Height(28).Rounded(4) .BackgroundColor(EditorTheme.Ink100) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text($"{EditorIcons.Plus} Add Component", font) .TextColor(EditorTheme.Ink500) .FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter) diff --git a/Prowl.Editor/MainMenuBar.cs b/Prowl.Editor/MainMenuBar.cs index 389f5145..73949914 100644 --- a/Prowl.Editor/MainMenuBar.cs +++ b/Prowl.Editor/MainMenuBar.cs @@ -36,7 +36,7 @@ public static void Draw(Paper paper) using (paper.Box($"menu_{index}") .Height(EditorTheme.MenuBarHeight) .Width(UnitValue.Auto) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(item.Label, font) .TextColor(EditorTheme.Ink500) .Alignment(TextAlignment.MiddleCenter) diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index 0fb9aa7e..2a65fcd6 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -211,7 +211,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) // Create button using (paper.Box("hier_add") .Width(RowHeight - 4).Height(RowHeight - 4).Rounded(4) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Ink500) .FontSize(12f).Alignment(TextAlignment.MiddleCenter) .Enter()) @@ -268,7 +268,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, .BackgroundColor(isSelected ? EditorTheme.Purple400 : (_dropTargetId == goId && _dropPos == DropPosition.Into) ? Color.FromArgb(60, EditorTheme.Purple400) : Color.Transparent) - .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.Ink200).End() .Rounded(2) .ChildLeft(indent + 2) .OnClick((go, currentIndex, flatList), (cap, e) => diff --git a/Prowl.Editor/Panels/PreferencesPanel.cs b/Prowl.Editor/Panels/PreferencesPanel.cs index b7f05de0..6fa87f2f 100644 --- a/Prowl.Editor/Panels/PreferencesPanel.cs +++ b/Prowl.Editor/Panels/PreferencesPanel.cs @@ -67,7 +67,7 @@ private void DrawTabBtn(Paper paper, Prowl.Scribe.FontFile font, string label, s paper.Box($"pref_tab_{tab}") .Height(26).ChildLeft(8).Rounded(3) .BackgroundColor(sel ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(sel ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(sel ? EditorTheme.Purple400 : EditorTheme.Ink200).End() .Text($"{icon} {label}", font) .TextColor(sel ? EditorTheme.Ink500 : EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) diff --git a/Prowl.Editor/Panels/ProjectSettingsPanel.cs b/Prowl.Editor/Panels/ProjectSettingsPanel.cs index 3d6b78a5..b17e9cda 100644 --- a/Prowl.Editor/Panels/ProjectSettingsPanel.cs +++ b/Prowl.Editor/Panels/ProjectSettingsPanel.cs @@ -59,7 +59,7 @@ public override void OnGUI(Paper paper, float width, float height) paper.Box($"ps_cat_{i}") .Height(26).ChildLeft(8).Rounded(3) .BackgroundColor(isSelected ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.Ink200).End() .Text($"{icon} {entry.Name}", font) .TextColor(isSelected ? EditorTheme.Ink500 : EditorTheme.Ink400) .FontSize(EditorTheme.FontSize - 1) diff --git a/Prowl.Editor/Panels/SceneViewPanel.cs b/Prowl.Editor/Panels/SceneViewPanel.cs index 45a3ec3c..5324531e 100644 --- a/Prowl.Editor/Panels/SceneViewPanel.cs +++ b/Prowl.Editor/Panels/SceneViewPanel.cs @@ -62,7 +62,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_move_btn") .Width(24).Height(24).Rounded(4) .BackgroundColor(isTranslate ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.ArrowsUpDownLeftRight, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Translate)); @@ -70,7 +70,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_rotate_btn") .Width(24).Height(24).Rounded(4) .BackgroundColor(isRotate ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.ArrowsRotate, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Rotate)); @@ -78,7 +78,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_scale_btn") .Width(24).Height(24).Rounded(4) .BackgroundColor(isScale ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.Maximize, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.ScaleAll)); @@ -86,7 +86,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_universal_btn") .Width(24).Height(24).Rounded(4) .BackgroundColor(isUniversal ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.Expand, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => SetGizmoMode(Gizmo.TransformGizmoMode.Universal)); @@ -98,7 +98,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) paper.Box("sv_grid_btn") .Width(24).Height(24).Rounded(4) .BackgroundColor(showGrid ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.TableCellsLarge, font).TextColor(EditorTheme.Ink500) .FontSize(11f).Alignment(TextAlignment.MiddleCenter) .OnClick(0, (_, _) => { if (_editorCamera != null) _editorCamera.ShowGrid = !_editorCamera.ShowGrid; }); diff --git a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs index de6e6534..317d5bb5 100644 --- a/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs +++ b/Prowl.Editor/Panels/WidgetPlaygroundPanel.cs @@ -401,7 +401,7 @@ public override void OnGUI(Paper paper, float width, float height) .Height(EditorTheme.RowHeight) .Width(200) .BackgroundColor(EditorTheme.Ink100) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .Tooltip("This is a tooltip! It appears after a short hover delay."); diff --git a/Prowl.Editor/Settings/TagsAndLayersSettings.cs b/Prowl.Editor/Settings/TagsAndLayersSettings.cs index 68aaf759..114af728 100644 --- a/Prowl.Editor/Settings/TagsAndLayersSettings.cs +++ b/Prowl.Editor/Settings/TagsAndLayersSettings.cs @@ -56,7 +56,7 @@ public override void OnGUI(Paper paper, float width) { paper.Box($"tl_tag_del_{i}") .Width(20).Height(22).Rounded(3) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink400) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) .OnClick(idx, (id, _) => diff --git a/Prowl.Editor/Widgets/ColorPicker.cs b/Prowl.Editor/Widgets/ColorPicker.cs index 85d26313..9b01fa0b 100644 --- a/Prowl.Editor/Widgets/ColorPicker.cs +++ b/Prowl.Editor/Widgets/ColorPicker.cs @@ -147,7 +147,7 @@ static void DrawPalette(Paper paper, string id, ElementHandle el, FontFile? font .BackgroundColor(EditorTheme.Ink100) .Rounded(2) .BorderColor(EditorTheme.Ink200).BorderWidth(1) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .OnPostLayout((handle, rect) => paper.Draw(ref handle, (canvas, r) => { float cx = (float)r.Min.X + (float)r.Size.X / 2f; diff --git a/Prowl.Editor/Widgets/CurveEditor.cs b/Prowl.Editor/Widgets/CurveEditor.cs index d21b5952..78c36455 100644 --- a/Prowl.Editor/Widgets/CurveEditor.cs +++ b/Prowl.Editor/Widgets/CurveEditor.cs @@ -295,7 +295,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< var fitBtn = paper.Box($"{id}_fit") .Height(22).ChildLeft(6).ChildRight(6) .BackgroundColor(EditorTheme.Ink100) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) .OnClick(e => { @@ -313,7 +313,7 @@ static void DrawFullEditor(Paper paper, string id, AnimationCurve curve, Action< var saveBtn = paper.Box($"{id}_save_preset") .Height(22).ChildLeft(6).ChildRight(6) .BackgroundColor(EditorTheme.Ink100) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) .OnClick(e => { diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index e5b488c7..8094b002 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -105,8 +105,7 @@ public static WidgetResult Button(Paper paper, string id, string label, fl .Height(EditorTheme.RowHeight) .ChildLeft(EditorTheme.RowHeight/4).ChildRight(EditorTheme.RowHeight/4) .BackgroundColor(EditorTheme.Ink100) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Active.BackgroundColor(EditorTheme.ButtonActive).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .OnClick(e => userCallback?.Invoke(true)); @@ -137,8 +136,7 @@ public static WidgetResult ButtonSquare(Paper paper, string id, string ico .Height(EditorTheme.RowHeight) .Width(EditorTheme.RowHeight) .BackgroundColor(EditorTheme.Ink100) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() - .Active.BackgroundColor(EditorTheme.ButtonActive).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .OnClick(e => userCallback?.Invoke(true)); @@ -165,7 +163,7 @@ public static WidgetResult Toggle(Paper paper, string id, string label, bo var box = paper.Box($"{id}_box") .Size(16, 16) .BackgroundColor(value ? EditorTheme.Purple400 : EditorTheme.Neutral300) - .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.Ink200).End() .Rounded(3) .Alignment(PaperUI.TextAlignment.MiddleCenter) .BorderColor(EditorTheme.Ink200).BorderWidth(1); @@ -436,7 +434,7 @@ public static void Foldout(Paper paper, string id, string label, Action drawCont .Height(EditorTheme.RowHeight) .ChildLeft(4) .BackgroundColor(EditorTheme.Neutral300) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(2); bool expanded = paper.GetElementStorage(header._handle, "exp", defaultValue); @@ -622,8 +620,7 @@ public static WidgetResult ToggleButton(Paper paper, string id, string lab .Height(EditorTheme.RowHeight) .ChildLeft(EditorTheme.RowHeight/4).ChildRight(EditorTheme.RowHeight/4) .BackgroundColor(value ? EditorTheme.Purple400 : EditorTheme.Ink100) - .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.ButtonHovered).End() - .Active.BackgroundColor(EditorTheme.ButtonActive).End() + .Hovered.BackgroundColor(value ? EditorTheme.Purple300 : EditorTheme.Ink200).End() .Rounded(3) .BorderColor(EditorTheme.Ink200).BorderWidth(1) .OnClick(e => userCallback?.Invoke(!value)).Enter()) @@ -687,7 +684,7 @@ public static WidgetResult SearchBar(Paper paper, string id, string valu var clearBtn = paper.Box($"{id}_clear") .Rounded(8) .Size(16).Margin(2, UnitValue.StretchOne) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Text(EditorIcons.Xmark, Font).TextColor(EditorTheme.Ink400).FontSize(14).Alignment(PaperUI.TextAlignment.MiddleCenter) .OnClick(e => userCallback?.Invoke("")); } diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 06ac9446..20a29d50 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -280,7 +280,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) paper.Box("fd_back").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowLeft, font).TextColor(backColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(4) .OnClick(0, (_, _) => NavigateBack()); @@ -289,7 +289,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) paper.Box("fd_fwd").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowRight, font).TextColor(fwdColor).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(4) .OnClick(0, (_, _) => NavigateForward()); @@ -297,7 +297,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) paper.Box("fd_up").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.ArrowUp, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(4) .OnClick(0, (_, _) => NavigateUp()); @@ -315,7 +315,7 @@ private static void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font) paper.Box("fd_newfolder").Width(btnW).Height(ToolbarHeight) .Text(EditorIcons.FolderPlus, font).TextColor(EditorTheme.Ink500).FontSize(14f) .Alignment(TextAlignment.MiddleCenter) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(4) .OnClick(0, (_, _) => { @@ -363,7 +363,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) bool isCurrent = _currentPath.Equals(qPath, StringComparison.OrdinalIgnoreCase); paper.Box($"fd_qa_{label}").Height(24) .BackgroundColor(isCurrent ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(isCurrent ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(isCurrent ? EditorTheme.Purple400 : EditorTheme.Ink200).End() .Rounded(4) .ChildLeft(8) .Text($"{icon} {label}", font).TextColor(EditorTheme.Ink500) @@ -390,7 +390,7 @@ private static void DrawSidebar(Paper paper, Prowl.Scribe.FontFile font) bool isCurrent = _currentPath.StartsWith(dName, StringComparison.OrdinalIgnoreCase); paper.Box($"fd_drv_{dName}").Height(24) .BackgroundColor(isCurrent ? EditorTheme.Purple400 : Color.Transparent) - .Hovered.BackgroundColor(isCurrent ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(isCurrent ? EditorTheme.Purple400 : EditorTheme.Ink200).End() .Rounded(4) .ChildLeft(8) .Text(dLabel, font).TextColor(EditorTheme.Ink500) @@ -418,7 +418,7 @@ void ColHeader(string id, string label, int col, float? width = null) .Text(label + (_sortColumn == col ? (_sortAscending ? " \u25B4" : " \u25BE") : ""), font) .TextColor(EditorTheme.Ink400).FontSize(EditorTheme.FontSize - 3) .Alignment(TextAlignment.MiddleLeft) - .Hovered.BackgroundColor(EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .OnClick(col, (c, _) => { if (_sortColumn == c) _sortAscending = !_sortAscending; @@ -488,7 +488,7 @@ private static void DrawFileList(Paper paper, Prowl.Scribe.FontFile font) using (paper.Row($"fd_row_{i}") .Height(RowHeight) .BackgroundColor(isSelected ? EditorTheme.Purple400 : (i % 2 == 0 ? Color.Transparent : Color.FromArgb(15, 255, 255, 255))) - .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.ButtonHovered).End() + .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.Ink200).End() .ChildLeft(8).RowBetween(0) .OnClick(entry, (e, ev) => { From 3e0c44b56d4a7114f7437b732e67dc18d77f2a26 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 03:44:15 -0400 Subject: [PATCH 13/26] Delete ButtonActive from EditorGUI buttons since they don't have a tabindex --- Prowl.Editor/EditorTheme.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index a8358db6..6f286930 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -54,7 +54,7 @@ public static class EditorTheme // Interactive // public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); // public static Color ButtonHovered = Color.FromArgb(255, 70, 70, 74); - public static Color ButtonActive = Color.FromArgb(255, 40, 40, 43); + // public static Color ButtonActive = Color.FromArgb(255, 40, 40, 43); // Accent // public static Color Accent = Color.FromArgb(255, 51, 122, 183); From 33ef9931ad182b559d41fd45dc09f339e73b8f6c Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 04:05:53 -0400 Subject: [PATCH 14/26] Update ConsolePanel to use Margin instead of ChildLeft/right/top/bottom etc --- Prowl.Editor/Panels/ConsolePanel.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Prowl.Editor/Panels/ConsolePanel.cs b/Prowl.Editor/Panels/ConsolePanel.cs index 60df7284..e693eeb2 100644 --- a/Prowl.Editor/Panels/ConsolePanel.cs +++ b/Prowl.Editor/Panels/ConsolePanel.cs @@ -17,6 +17,7 @@ public class ConsolePanel : DockPanel public override string Title => "Console"; public override string Icon => EditorIcons.Terminal; + private const float ToolbarHeight = 30f; private const int MaxMessages = 500; private const float RowHeight = 20f; private static readonly List _messages = new(); @@ -29,7 +30,6 @@ public class ConsolePanel : DockPanel private bool _autoScroll = true; private string _searchText = ""; - private const float ToolbarHeight = 30f; private struct LogEntry { @@ -96,11 +96,8 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) { using (paper.Row("con_toolbar") .Height(ToolbarHeight) - .ChildLeft(4) - .ChildRight(4) + .Margin(4, 4, 4, 0) .RowBetween(4) - .ChildTop(4) - .ChildBottom(0) .Enter()) { // Clear From 18ad520c96478e1d890adb694ce71f8781565c81 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 04:06:12 -0400 Subject: [PATCH 15/26] Overhaul HierarchyPanel --- Prowl.Editor/Panels/HierarchyPanel.cs | 72 ++++++++++++++++----------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/Prowl.Editor/Panels/HierarchyPanel.cs b/Prowl.Editor/Panels/HierarchyPanel.cs index 2a65fcd6..fe85b86c 100644 --- a/Prowl.Editor/Panels/HierarchyPanel.cs +++ b/Prowl.Editor/Panels/HierarchyPanel.cs @@ -24,7 +24,9 @@ public class HierarchyPanel : DockPanel private Paper? _paper; private HashSet _renamingIds = new(); // GOs currently being renamed private string _renameText = ""; - private const float RowHeight = 22f; + + private const float ToolbarHeight = 30f; + // private const float RowHeight = 30f; private const float IndentSize = 16f; // Drag state @@ -60,7 +62,8 @@ public override void OnGUI(Paper paper, float width, float height) if (scene == null) { - paper.Box("hier_empty").Height(60) + paper.Box("hier_empty") + .Height(60) .Text("No Scene Loaded", font) .TextColor(EditorTheme.Ink300) .FontSize(EditorTheme.FontSize) @@ -72,16 +75,23 @@ public override void OnGUI(Paper paper, float width, float height) } // Scene name header - paper.Box("hier_scene_name") - .Height(22).ChildLeft(8) - .BackgroundColor(EditorTheme.Neutral200) - .Text($"{EditorIcons.Film} {scene.Name}", font) - .TextColor(EditorTheme.Ink500) - .FontSize(EditorTheme.FontSize - 1) - .Alignment(TextAlignment.MiddleLeft); + using (paper.Box("hier_scene_name") + .Height(EditorTheme.RowHeight) + .Margin(6, 6, 0, 6) + .Rounded(4) + .BackgroundColor(EditorTheme.Neutral200).Enter()) + { + paper.Box("hier_scene_name_text") + .Margin(8, 0) + .Height(EditorTheme.RowHeight) + .Text($"{EditorIcons.Film} {scene.Name}", font) + .TextColor(EditorTheme.Ink500) + .FontSize(EditorTheme.FontSize - 1) + .Alignment(TextAlignment.MiddleLeft); + } // Tree view - using (ScrollView.Begin(paper, "hier_scroll", width, height - RowHeight - 22)) + using (ScrollView.Begin(paper, "hier_scroll", width, height - EditorTheme.RowHeight - 22)) { var roots = GetDisplayRoots(scene); @@ -203,24 +213,28 @@ public override void OnGUI(Paper paper, float width, float height) private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width) { using (paper.Row("hier_toolbar") - .Height(RowHeight) - .ChildLeft(4).ChildRight(4).RowBetween(4) - .ChildTop(2).ChildBottom(2) + .Height(ToolbarHeight) + .Margin(4, 4, 4, 0) + .RowBetween(4) .Enter()) { // Create button using (paper.Box("hier_add") - .Width(RowHeight - 4).Height(RowHeight - 4).Rounded(4) + .Width(EditorTheme.RowHeight) + .Height(EditorTheme.RowHeight) + .Rounded(4) .Hovered.BackgroundColor(EditorTheme.Ink200).End() - .Text(EditorIcons.Plus, font).TextColor(EditorTheme.Ink500) - .FontSize(12f).Alignment(TextAlignment.MiddleCenter) + .Text(EditorIcons.Plus, font) + .TextColor(EditorTheme.Ink500) + .FontSize(16f) + .Alignment(TextAlignment.MiddleCenter) .Enter()) { if (paper.IsParentHovered) { var builder = new ContextMenuBuilder(); BuildCreateMenu(builder, null); - builder.Render(paper, "hier_add_menu", 0, RowHeight - 4); + builder.Render(paper, "hier_add_menu", 0, EditorTheme.RowHeight - 4); } } @@ -263,14 +277,15 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, .BackgroundColor(EditorTheme.Purple400); } - using (paper.Row($"hier_go_{goId}") - .Height(RowHeight) + using (paper + .Row($"hier_go_{goId}") + .Height(EditorTheme.RowHeight) .BackgroundColor(isSelected ? EditorTheme.Purple400 : (_dropTargetId == goId && _dropPos == DropPosition.Into) ? Color.FromArgb(60, EditorTheme.Purple400) : Color.Transparent) .Hovered.BackgroundColor(isSelected ? EditorTheme.Purple400 : EditorTheme.Ink200).End() - .Rounded(2) - .ChildLeft(indent + 2) + .Rounded(4) + .Margin(indent + 8, 0, 0, 0) .OnClick((go, currentIndex, flatList), (cap, e) => { bool ctrl = _paper?.IsKeyDown(PaperKey.LeftControl) == true || _paper?.IsKeyDown(PaperKey.RightControl) == true; @@ -291,7 +306,8 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, if (hasChildren) { paper.Box($"hier_arr_{goId}") - .Width(14).Height(RowHeight) + .Width(14) + .Height(EditorTheme.RowHeight) .Text(isExpanded ? EditorIcons.AngleDown : EditorIcons.AngleRight, font) .TextColor(EditorTheme.Ink400) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) @@ -303,12 +319,12 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, } else { - paper.Box($"hier_arr_{goId}").Width(14).Height(RowHeight); + paper.Box($"hier_arr_{goId}").Width(14).Height(EditorTheme.RowHeight); } // Icon paper.Box($"hier_ico_{goId}") - .Width(16).Height(RowHeight) + .Width(16).Height(EditorTheme.RowHeight) .Text(icon, font) .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink400 : EditorTheme.Ink300) .FontSize(11f).Alignment(TextAlignment.MiddleCenter); @@ -343,7 +359,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, else { paper.Box($"hier_name_{goId}") - .Height(RowHeight).ChildLeft(4) + .Height(EditorTheme.RowHeight).ChildLeft(4) .Text(go.Name, font) .TextColor(go.EnabledInHierarchy ? EditorTheme.Ink500 : EditorTheme.Ink300) .FontSize(EditorTheme.FontSize - 1) @@ -352,7 +368,7 @@ private void DrawGameObjectNode(Paper paper, Prowl.Scribe.FontFile font, // Enable/disable toggle (eye icon) paper.Box($"hier_vis_{goId}") - .Width(18).Height(RowHeight) + .Width(18).Height(EditorTheme.RowHeight) .Text(go.Enabled ? EditorIcons.Eye : EditorIcons.EyeSlash, font) .TextColor(go.Enabled ? EditorTheme.Ink400 : EditorTheme.Ink300) .FontSize(9f).Alignment(TextAlignment.MiddleCenter) @@ -426,8 +442,8 @@ private void HandleDropTarget(Paper paper, GameObject go, string goId) float mouseY = Input.MousePosition.Y; float relY = mouseY - rowY; - float topZone = RowHeight * 0.25f; - float bottomZone = RowHeight * 0.75f; + float topZone = EditorTheme.RowHeight * 0.25f; + float bottomZone = EditorTheme.RowHeight * 0.75f; if (relY < topZone) { From 1f1ff6ecb70b6cbb1ebd49c24d578b35127b9e87 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 04:06:39 -0400 Subject: [PATCH 16/26] Update ProjectPanel FolderTree hover colors --- Prowl.Editor/Panels/ProjectPanel.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Prowl.Editor/Panels/ProjectPanel.cs b/Prowl.Editor/Panels/ProjectPanel.cs index 7c9ab929..fd6e368d 100644 --- a/Prowl.Editor/Panels/ProjectPanel.cs +++ b/Prowl.Editor/Panels/ProjectPanel.cs @@ -194,8 +194,8 @@ private void DrawFolderNode(Paper paper, Prowl.Scribe.FontFile font, string abso using (paper.Row($"proj_fn_{relativePath.GetHashCode()}") .Height(22) - .BackgroundColor(isSelected ? EditorTheme.Neutral400 : Color.Transparent) - .Hovered.BackgroundColor(EditorTheme.Neutral500).End() + .BackgroundColor(isSelected ? EditorTheme.Ink100 : Color.Transparent) + .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) .ChildLeft(indent + 4) .OnClick(relativePath, (path, _) => _currentFolder = path) From 7f126b15b16c0cfa6831f175e3fbe35a067f8a88 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 04:13:17 -0400 Subject: [PATCH 17/26] Delete commented out colors in EditorTheme.cs --- Prowl.Editor/EditorTheme.cs | 45 ------------------------------------- 1 file changed, 45 deletions(-) diff --git a/Prowl.Editor/EditorTheme.cs b/Prowl.Editor/EditorTheme.cs index 6f286930..1c47f108 100644 --- a/Prowl.Editor/EditorTheme.cs +++ b/Prowl.Editor/EditorTheme.cs @@ -29,51 +29,6 @@ public static class EditorTheme public static float TabCloseSize = 14f; public static float TabGap = 0f; - #region Outdated - - // 4-shade system: Darkest → Dark → Normal → Bright - // public static Color Background = Color.FromArgb(255, 10, 10, 12);// Background (near black) - // public static Color Darkest = Color.FromArgb(255, 20, 20, 22); // Menu bar - // public static Color Dark = Color.FromArgb(255, 28, 28, 30); // Background (near black) - // public static Color Normal = Color.FromArgb(255, 37, 37, 40); // Windows/panels - // public static Color Bright = Color.FromArgb(255, 65, 65, 70); // Scrollbar, outline - - // Aliases for readability - // public static Color MenuBarBackground => Darkest; - // public static Color WindowBackground => Normal; - // public static Color PanelBackground => Normal; - // public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33); - // public static Color InputBackground = Color.FromArgb(255, 28, 28, 30); - // public static Color Border => Bright; - - // Text - // public static Color Text = Color.FromArgb(255, 220, 220, 220); - // public static Color TextDim = Color.FromArgb(255, 150, 150, 150); - // public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90); - - // Interactive - // public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58); - // public static Color ButtonHovered = Color.FromArgb(255, 70, 70, 74); - // public static Color ButtonActive = Color.FromArgb(255, 40, 40, 43); - - // Accent - // public static Color Accent = Color.FromArgb(255, 51, 122, 183); - // public static Color AccentDim = Color.FromArgb(255, 40, 90, 140); - - // Borders - // public static Color BorderFocused = Color.FromArgb(255, 51, 122, 183); - - // Splitter - // public static Color Splitter = Color.FromArgb(255, 25, 25, 25); - // public static Color SplitterHovered = Color.FromArgb(255, 51, 122, 183); - - // Tab - // public static Color TabActive => Normal; - // public static Color TabInactive => Darkest; - // public static Color TabHovered = Color.FromArgb(255, 55, 55, 58); - - #endregion - // Static color palette for the application theme. // Built from 8 base colors: #101116, #16151A, #18191D, #1D1E22, // #563784, #82AAC6, #271D36, #CB594F. From a1423915f96f143558871d2c00cc0683c6fe0d8e Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 05:23:49 -0400 Subject: [PATCH 18/26] Create WebService.cs for opening links in browser --- Prowl.Editor/WebService.cs | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Prowl.Editor/WebService.cs diff --git a/Prowl.Editor/WebService.cs b/Prowl.Editor/WebService.cs new file mode 100644 index 00000000..142fe17c --- /dev/null +++ b/Prowl.Editor/WebService.cs @@ -0,0 +1,34 @@ +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; + +namespace Prowl.Editor; + +public static class WebService +{ + public static void OpenUrl(string url) + { + try + { + // For Windows: Launching via shell + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + Process.Start(new ProcessStartInfo(url) { UseShellExecute = true }); + } + // For macOS: Use the 'open' command + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + Process.Start("open", url); + } + // For Linux: Use 'xdg-open' + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + Process.Start("xdg-open", url); + } + } + catch (Exception ex) + { + Console.WriteLine($"Unable to open link: {ex.Message}"); + } + } +} \ No newline at end of file From 17db4e33c3acf22f87dd1d5f67125bac45534c7c Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 05:23:53 -0400 Subject: [PATCH 19/26] Overhauled ProjectLauncher experience --- Prowl.Editor/Program.cs | 2 +- Prowl.Editor/Project/ProjectLauncher.cs | 231 ++++++++++++++---------- 2 files changed, 137 insertions(+), 96 deletions(-) diff --git a/Prowl.Editor/Program.cs b/Prowl.Editor/Program.cs index f6e26bc7..acbd0ec1 100644 --- a/Prowl.Editor/Program.cs +++ b/Prowl.Editor/Program.cs @@ -5,6 +5,6 @@ public static class Program public static void Main(string[] args) { var editor = new EditorApplication(); - editor.Run("Prowl Editor", 1600, 900); + editor.Run("Prowl Editor", 1200, 800); } } diff --git a/Prowl.Editor/Project/ProjectLauncher.cs b/Prowl.Editor/Project/ProjectLauncher.cs index 37f32ebc..86a73656 100644 --- a/Prowl.Editor/Project/ProjectLauncher.cs +++ b/Prowl.Editor/Project/ProjectLauncher.cs @@ -52,119 +52,160 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) int h = Window.InternalWindow.Size.Y; // Full background - paper.Box("pl_bg") - .PositionType(PositionType.SelfDirected) - .Position(0, 0).Size(w, h) - .BackgroundColor(EditorTheme.Neutral100) - .OnPostLayout((handle, rect) => paper.Draw(ref handle, (canvas, r) => - { - float cx = w / 2f; - float cy = h / 2f; - float radius = Math.Max(cx, cy) * 1.2f; - float t = _animTime * 0.05f; - var transparent = Prowl.Vector.Color32.FromArgb(0, 0, 0, 0); - - // Subtle background gradients (same as editor but dimmer) - float px = cx + (float)Math.Sin(t) * cx * 0.6f; - float py = cy + (float)Math.Sin(t * 2) * cy * 0.3f; - var purple = Prowl.Vector.Color32.FromArgb(25, 140, 60, 200); - canvas.SetRadialBrush(px, py, 0, radius, purple, transparent); - canvas.BeginPath(); - canvas.Rect(0, 0, w, h); - canvas.Fill(); - - float bx = cx - (float)Math.Sin(t) * cx * 0.6f; - float by = cy - (float)Math.Sin(t * 2) * cy * 0.3f; - var blue = Prowl.Vector.Color32.FromArgb(25, 60, 140, 220); - canvas.SetRadialBrush(bx, by, 0, radius, blue, transparent); - canvas.BeginPath(); - canvas.Rect(0, 0, w, h); - canvas.Fill(); - })); + // paper.Box("pl_bg") + // .PositionType(PositionType.SelfDirected) + // .Position(0, 0) + // .Size(w, h) + // .BackgroundColor(EditorTheme.Neutral100) + // .OnPostLayout((handle, rect) => paper.Draw(ref handle, (canvas, r) => + // { + // float cx = w / 2f; + // float cy = h / 2f; + // float radius = Math.Max(cx, cy) * 1.2f; + // float t = _animTime * 0.05f; + // var transparent = Prowl.Vector.Color32.FromArgb(0, 0, 0, 0); + + // // Subtle background gradients (same as editor but dimmer) + // float px = cx + (float)Math.Sin(t) * cx * 0.6f; + // float py = cy + (float)Math.Sin(t * 2) * cy * 0.3f; + // var purple = Prowl.Vector.Color32.FromArgb(25, 140, 60, 200); + // canvas.SetRadialBrush(px, py, 0, radius, purple, transparent); + // canvas.BeginPath(); + // canvas.Rect(0, 0, w, h); + // canvas.Fill(); + + // float bx = cx - (float)Math.Sin(t) * cx * 0.6f; + // float by = cy - (float)Math.Sin(t * 2) * cy * 0.3f; + // var blue = Prowl.Vector.Color32.FromArgb(25, 60, 140, 220); + // canvas.SetRadialBrush(bx, by, 0, radius, blue, transparent); + // canvas.BeginPath(); + // canvas.Rect(0, 0, w, h); + // canvas.Fill(); + // })); // Center card - float cardW = 600f; - float cardH = 500f; + // float cardW = 600f; + // float cardH = 500f; - using (paper.Column("pl_card") - .Size(cardW, cardH) - .Margin(UnitValue.StretchOne) - .BackgroundColor(EditorTheme.Neutral300) - .BorderColor(EditorTheme.Ink200) + float sidebarW = 200f; + + using (paper.Row("root") + .PositionType(PositionType.SelfDirected) + .Position(0, 0) + .Size(w, h) + .BorderColor(EditorTheme.Ink100) .BorderWidth(1) - .Rounded(EditorTheme.Roundness) + .BackgroundColor(EditorTheme.Neutral300) .Enter()) { - // Header - using (paper.Row("pl_header") - .Height(60) - .BackgroundColor(EditorTheme.Neutral200) - .RoundedTop(EditorTheme.Roundness) - .ChildLeft(24) - .ChildRight(24) - .RowBetween(12) + using (paper.Column("sidebar") + .BackgroundColor(EditorTheme.Neutral400) + .Size(sidebarW, h) + .BorderColor(EditorTheme.Ink100) + .BorderWidth(1) .Enter()) { - paper.Box("pl_title") + + // Prowl Emblem + using (paper.Row("pl_header") .Height(60) - .Text("PROWL", boldFont) - .TextColor(EditorTheme.Ink500) - .FontSize(28f) - .Alignment(TextAlignment.MiddleLeft); - - // Spacer - paper.Box("pl_spacer"); - - paper.Box("pl_version") - .Height(60).Width(80) - .Text("v0.0.1", font) - .TextColor(EditorTheme.Ink400) - .FontSize(12f) - .Alignment(TextAlignment.MiddleRight); + .RowBetween(12) + .BackgroundColor(EditorTheme.Neutral300) + .BorderColor(EditorTheme.Ink100) + .BorderWidth(1) + .Enter()) + { + paper.Box("pl_title") + .Height(60) + .Margin(16, 16, 8, 8) + .Text("PROWL", boldFont) + .TextColor(EditorTheme.Ink500) + .FontSize(28f) + .Alignment(TextAlignment.MiddleLeft); + + // Spacer + paper.Box("pl_spacer"); + + paper.Box("pl_version") + .Height(60) + .Width(80) + .Margin(16, 16, 12, 8) + .Text("v0.0.1", font) + .TextColor(EditorTheme.Ink400) + .FontSize(12f) + .Alignment(TextAlignment.MiddleRight); + } + + paper.Box("spacer").Height(UnitValue.Stretch()); + + // Links + using (paper.Column("pl_header") + .Height(60) + .ColBetween(12) + .Margin(24, 12) + .Enter()) + { + EditorGUI.Button(paper, "yt_link", "YouTube").OnValueChanged((_) => + { + WebService.OpenUrl("https://youtube.com/@prowlengine"); + }); + + EditorGUI.Button(paper, "gh_link", "Github").OnValueChanged((_) => + { + WebService.OpenUrl("https://github.com/ProwlEngine/Prowl"); + }); + } } - // Toolbar: New / Open buttons - using (paper.Row("pl_toolbar") - .Height(40) - .ChildLeft(10) - .ChildRight(10) - .ChildTop(8) - .RowBetween(8) + using (paper.Column("content") + .Size(w - sidebarW, h) .Enter()) { - EditorGUI.Button(paper, "pl_btn_new", $"{EditorIcons.Plus} New Project") - .OnValueChanged(_ => _showNewProject = !_showNewProject); + // Toolbar: New / Open buttons + using (paper.Row("pl_toolbar") + .Height(40) + .Margin(10, 10, 16, 0) + .RowBetween(8) + .Enter()) + { + paper.Box("pl_recent_label") + .Width(UnitValue.Auto) + .Height(EditorTheme.RowHeight) + .Text("Projects", boldFont) + .TextColor(EditorTheme.Ink500) + .FontSize(EditorTheme.FontSize + 8) + .Alignment(TextAlignment.MiddleLeft); - EditorGUI.Button(paper, "pl_btn_open", $"{EditorIcons.FolderOpen} Open Project") - .OnValueChanged(_ => - { - FileDialog.Open(FileDialogMode.SelectFolder, path => + // Spacer + paper.Box("pl_tb_spacer"); + + // Spacer + EditorGUI.SearchBar(paper, "search", "", "Search"); + + EditorGUI.Button(paper, "pl_btn_open", $"{EditorIcons.FolderOpen} Open Project") + .OnValueChanged(_ => { - if (path == null) return; - TryOpenProject(path); + FileDialog.Open(FileDialogMode.SelectFolder, path => + { + if (path == null) return; + TryOpenProject(path); + }); }); - }); - // Spacer - paper.Box("pl_tb_spacer"); + EditorGUI.Button(paper, "pl_btn_new", $"{EditorIcons.Plus} New Project") + .OnValueChanged(_ => _showNewProject = !_showNewProject); - paper.Box("pl_recent_label") - .Width(UnitValue.Auto) - .Height(EditorTheme.RowHeight) - .Text("Recent Projects", font) - .TextColor(EditorTheme.Ink300) - .FontSize(EditorTheme.FontSize - 2) - .Alignment(TextAlignment.MiddleRight); - } + } - // New project panel (collapsible) - if (_showNewProject) - { - DrawNewProjectPanel(paper, font); - } + // New project panel (collapsible) + if (_showNewProject) + { + DrawNewProjectPanel(paper, font); + } - // Recent projects list - DrawRecentProjects(paper, font, cardW, cardH - 60 - 40 - (_showNewProject ? 80 : 0)); + // Recent projects list + DrawRecentProjects(paper, font, w - sidebarW, h - 60 - 40 - (_showNewProject ? 80 : 0)); + } } } @@ -221,8 +262,8 @@ private static void DrawNewProjectPanel(Paper paper, Prowl.Scribe.FontFile font) { FileDialog.Open(FileDialogMode.SelectFolder, path => { - if (path != null) _newProjectPath = path; - }, _newProjectPath); + if (path != null) _newProjectPath = path; + }, _newProjectPath); }); EditorGUI.Button(paper, "pl_np_create", "Create", width: 70) From 3d78127af567f567a3c286022183d74a2fada9f2 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 05:37:08 -0400 Subject: [PATCH 20/26] Fix github link typo --- Prowl.Editor/Project/ProjectLauncher.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Prowl.Editor/Project/ProjectLauncher.cs b/Prowl.Editor/Project/ProjectLauncher.cs index 86a73656..3399eacb 100644 --- a/Prowl.Editor/Project/ProjectLauncher.cs +++ b/Prowl.Editor/Project/ProjectLauncher.cs @@ -150,7 +150,7 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) WebService.OpenUrl("https://youtube.com/@prowlengine"); }); - EditorGUI.Button(paper, "gh_link", "Github").OnValueChanged((_) => + EditorGUI.Button(paper, "gh_link", "GitHub").OnValueChanged((_) => { WebService.OpenUrl("https://github.com/ProwlEngine/Prowl"); }); From 1ead5a5dc70619d3f57d9be33bff54266427a66c Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 05:53:39 -0400 Subject: [PATCH 21/26] EditorGUI button remove ChildLeft/ChildRight replace with Margin --- Prowl.Editor/Widgets/EditorGUI.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Prowl.Editor/Widgets/EditorGUI.cs b/Prowl.Editor/Widgets/EditorGUI.cs index 8094b002..c3d9ff43 100644 --- a/Prowl.Editor/Widgets/EditorGUI.cs +++ b/Prowl.Editor/Widgets/EditorGUI.cs @@ -103,11 +103,11 @@ public static WidgetResult Button(Paper paper, string id, string label, fl var el = paper.Box(id) .Height(EditorTheme.RowHeight) - .ChildLeft(EditorTheme.RowHeight/4).ChildRight(EditorTheme.RowHeight/4) .BackgroundColor(EditorTheme.Ink100) .Hovered.BackgroundColor(EditorTheme.Ink200).End() .Rounded(3) - .BorderColor(EditorTheme.Ink200).BorderWidth(1) + .BorderColor(EditorTheme.Ink200) + .BorderWidth(1) .OnClick(e => userCallback?.Invoke(true)); if (width > 0) el.Width(width); @@ -115,6 +115,8 @@ public static WidgetResult Button(Paper paper, string id, string label, fl { if (Font != null) paper.Box($"{id}_label") + .Height(EditorTheme.RowHeight) + .Margin(EditorTheme.RowHeight/4, 0) .Alignment(PaperUI.TextAlignment.MiddleLeft) .Text(label, Font) .TextColor(EditorTheme.Ink500) From 4d5ef54312d509385298008943a091ef3d0cad0b Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 05:53:42 -0400 Subject: [PATCH 22/26] Update ProjectLauncher.cs --- Prowl.Editor/Project/ProjectLauncher.cs | 49 ++++++++++++++++--------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/Prowl.Editor/Project/ProjectLauncher.cs b/Prowl.Editor/Project/ProjectLauncher.cs index 3399eacb..3dcf1510 100644 --- a/Prowl.Editor/Project/ProjectLauncher.cs +++ b/Prowl.Editor/Project/ProjectLauncher.cs @@ -147,12 +147,12 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) { EditorGUI.Button(paper, "yt_link", "YouTube").OnValueChanged((_) => { - WebService.OpenUrl("https://youtube.com/@prowlengine"); + WebService.OpenUrl("https://youtube.com/@prowlengine"); }); EditorGUI.Button(paper, "gh_link", "GitHub").OnValueChanged((_) => { - WebService.OpenUrl("https://github.com/ProwlEngine/Prowl"); + WebService.OpenUrl("https://github.com/ProwlEngine/Prowl"); }); } } @@ -161,14 +161,14 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) .Size(w - sidebarW, h) .Enter()) { - // Toolbar: New / Open buttons - using (paper.Row("pl_toolbar") + // New / Open buttons + using (paper.Row("toolbar") .Height(40) - .Margin(10, 10, 16, 0) + .Margin(10, 10, 32, 0) .RowBetween(8) .Enter()) { - paper.Box("pl_recent_label") + paper.Box("tl_label") .Width(UnitValue.Auto) .Height(EditorTheme.RowHeight) .Text("Projects", boldFont) @@ -177,24 +177,39 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) .Alignment(TextAlignment.MiddleLeft); // Spacer - paper.Box("pl_tb_spacer"); + paper.Box("tl_tb_spacer"); // Spacer EditorGUI.SearchBar(paper, "search", "", "Search"); - - EditorGUI.Button(paper, "pl_btn_open", $"{EditorIcons.FolderOpen} Open Project") + + EditorGUI.Button(paper, "tl_btn_open", $"{EditorIcons.FolderOpen} Open Project", 130) .OnValueChanged(_ => { FileDialog.Open(FileDialogMode.SelectFolder, path => { - if (path == null) return; - TryOpenProject(path); - }); + if (path == null) return; + TryOpenProject(path); + }); }); - EditorGUI.Button(paper, "pl_btn_new", $"{EditorIcons.Plus} New Project") - .OnValueChanged(_ => _showNewProject = !_showNewProject); - + using (paper.Box("tl_btn_new") + .Height(EditorTheme.RowHeight) + .Width(120) + .BackgroundColor(EditorTheme.Blue300) + .Hovered.BackgroundColor(EditorTheme.Blue400).End() + .Rounded(3) + .BorderColor(EditorTheme.Blue400) + .BorderWidth(1) + .OnClick((_) => _showNewProject = !_showNewProject) + .Enter()) { + paper.Box($"label") + .Height(EditorTheme.RowHeight) + .Margin(EditorTheme.RowHeight / 4, 0) + .Alignment(PaperUI.TextAlignment.MiddleLeft) + .Text($" {EditorIcons.Plus} New Project", EditorTheme.DefaultFont) + .TextColor(EditorTheme.Ink500) + .FontSize(EditorTheme.FontSize); + } } // New project panel (collapsible) @@ -262,8 +277,8 @@ private static void DrawNewProjectPanel(Paper paper, Prowl.Scribe.FontFile font) { FileDialog.Open(FileDialogMode.SelectFolder, path => { - if (path != null) _newProjectPath = path; - }, _newProjectPath); + if (path != null) _newProjectPath = path; + }, _newProjectPath); }); EditorGUI.Button(paper, "pl_np_create", "Create", width: 70) From 2931c491300e6fe0a0a360fad425644991b8695a Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 05:57:08 -0400 Subject: [PATCH 23/26] Update FileDialog button width of confirm/cancel --- Prowl.Editor/Widgets/FileDialog.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Prowl.Editor/Widgets/FileDialog.cs b/Prowl.Editor/Widgets/FileDialog.cs index 20a29d50..2f82f69a 100644 --- a/Prowl.Editor/Widgets/FileDialog.cs +++ b/Prowl.Editor/Widgets/FileDialog.cs @@ -588,10 +588,10 @@ private static void DrawBottomBar(Paper paper, Prowl.Scribe.FontFile font) _ => "Open" }; - EditorGUI.Button(paper, "fd_btn_ok", confirmLabel, width: 90) + EditorGUI.Button(paper, "fd_btn_ok", confirmLabel, width: 101) .OnValueChanged(_ => ConfirmSelection()); - EditorGUI.Button(paper, "fd_btn_cancel", "Cancel", width: 90) + EditorGUI.Button(paper, "fd_btn_cancel", "Cancel", width: 60) .OnValueChanged(_ => Close(null)); } } From 041aa3eb099e99d7e7a1f11202e75484df5065b2 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 06:09:50 -0400 Subject: [PATCH 24/26] Fixed scrollbar overflow for ConsolePanel and ProjectPanel --- Prowl.Editor/Panels/ConsolePanel.cs | 4 ++-- Prowl.Editor/Panels/ProjectPanel.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Prowl.Editor/Panels/ConsolePanel.cs b/Prowl.Editor/Panels/ConsolePanel.cs index e693eeb2..0ae59c28 100644 --- a/Prowl.Editor/Panels/ConsolePanel.cs +++ b/Prowl.Editor/Panels/ConsolePanel.cs @@ -17,7 +17,7 @@ public class ConsolePanel : DockPanel public override string Title => "Console"; public override string Icon => EditorIcons.Terminal; - private const float ToolbarHeight = 30f; + private const float ToolbarHeight = 26f; private const int MaxMessages = 500; private const float RowHeight = 20f; private static readonly List _messages = new(); @@ -88,7 +88,7 @@ public override void OnGUI(Paper paper, float width, float height) using (paper.Column("con_root").Size(width, height).Enter()) { DrawToolbar(paper, font, width); - DrawMessages(paper, font, width, height - 26); + DrawMessages(paper, font, width, height - 33); } } diff --git a/Prowl.Editor/Panels/ProjectPanel.cs b/Prowl.Editor/Panels/ProjectPanel.cs index fd6e368d..44096509 100644 --- a/Prowl.Editor/Panels/ProjectPanel.cs +++ b/Prowl.Editor/Panels/ProjectPanel.cs @@ -33,7 +33,7 @@ public class ProjectPanel : DockPanel private const float MaxThumbSize = 128f; private const float ListThreshold = 32f; // Below this = list view - private const float ToolbarHeight = 30f; + private const float ToolbarHeight = 30; private const float FolderTreeWidth = 180f; public override void OnGUI(Paper paper, float width, float height) @@ -295,7 +295,7 @@ private void DrawContent(Paper paper, Prowl.Scribe.FontFile font, float width, f // Breadcrumb DrawBreadcrumb(paper, font, width, 20); - using (ScrollView.Begin(paper, "proj_content", width, height - 20)) + using (ScrollView.Begin(paper, "proj_content", width, height - 31)) { using (paper.Column("proj_content_inner") .Margin(6, 0, 0, 6) From b342f7b96952e599482bdc10faa8639c3ac19e63 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 06:11:49 -0400 Subject: [PATCH 25/26] Update ProjectLauncher.cs --- Prowl.Editor/Project/ProjectLauncher.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Prowl.Editor/Project/ProjectLauncher.cs b/Prowl.Editor/Project/ProjectLauncher.cs index 3dcf1510..61d06962 100644 --- a/Prowl.Editor/Project/ProjectLauncher.cs +++ b/Prowl.Editor/Project/ProjectLauncher.cs @@ -117,7 +117,7 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) { paper.Box("pl_title") .Height(60) - .Margin(16, 16, 8, 8) + .Margin(16, 16, 0, 8) .Text("PROWL", boldFont) .TextColor(EditorTheme.Ink500) .FontSize(28f) @@ -142,7 +142,7 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) using (paper.Column("pl_header") .Height(60) .ColBetween(12) - .Margin(24, 12) + .Margin(12, 12) .Enter()) { EditorGUI.Button(paper, "yt_link", "YouTube").OnValueChanged((_) => From 7dc5f84ee38f4da33f58a9a0bdefff1f5a85c8a8 Mon Sep 17 00:00:00 2001 From: Abdiel Lopez <48071553+PaperPrototype@users.noreply.github.com> Date: Mon, 6 Apr 2026 06:12:18 -0400 Subject: [PATCH 26/26] Update ProjectLauncher.cs --- Prowl.Editor/Project/ProjectLauncher.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Prowl.Editor/Project/ProjectLauncher.cs b/Prowl.Editor/Project/ProjectLauncher.cs index 61d06962..54b900bf 100644 --- a/Prowl.Editor/Project/ProjectLauncher.cs +++ b/Prowl.Editor/Project/ProjectLauncher.cs @@ -142,7 +142,7 @@ public static void Draw(Paper paper, float dt, bool forceDraw = false) using (paper.Column("pl_header") .Height(60) .ColBetween(12) - .Margin(12, 12) + .Margin(16, 12) .Enter()) { EditorGUI.Button(paper, "yt_link", "YouTube").OnValueChanged((_) =>