Skip to content

Modified icons invocations to standardize them #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xZekro51 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Modified icons invocations to standardize them #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb74793
Fixed NewScriptDialog Buttons
xZekro51 Sep 12, 2026
f0f9ff1
Modified Icons invocations on NewScriptDialog and Hierarchy to standa…
xZekro51 Sep 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Prowl.Editor/GUI/Panels/HierarchyPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ public override void OnGUI(Paper paper, float width, float height)
var (goIcon, goColor) = GetGoStyle(go);
if (!go.EnabledInHierarchy) goColor = Color.FromArgb(120, goColor);
paper.Box($"hier_ico_{goId}")
.Width(18).Height(EditorTheme.RowHeight).IsNotInteractable()
.Icon(paper, goIcon, goColor, size: 14f);
.Width(24).Height(EditorTheme.RowHeight).IsNotInteractable()
.Icon(paper, goIcon, goColor, size: 19f);

// Name or rename field
if (RenameOverlay.IsRenaming(goId))
Expand All @@ -393,9 +393,10 @@ public override void OnGUI(Paper paper, float width, float height)
// Visibility eye
paper.Box($"hier_vis_{goId}")
.Width(18).Height(EditorTheme.RowHeight)
.Text(node.TrailingIcon ?? "", font)
/*.Text(node.TrailingIcon ?? "", font)
.TextColor(node.TrailingIconColor ?? EditorTheme.Ink400)
.FontSize(9f).Alignment(TextAlignment.MiddleCenter)
.FontSize(9f).Alignment(TextAlignment.MiddleCenter)*/
.Icon(paper, new EditorGlyphIcon(node.TrailingIcon ?? ""), node.TrailingIconColor ?? EditorTheme.Ink400, size: 19f)
.StopEventPropagation()
.OnClick(go, (g, _) =>
{
Expand Down
46 changes: 10 additions & 36 deletions Prowl.Editor/GUI/Popups/NewScriptDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,9 @@ private static void DrawContent(Paper paper)
if (font != null)
{
paper.Box($"scr_tpl_ico_{i}")
.Width(22).Height(28)
.Text(tpl.Icon, font)
.TextColor(EditorTheme.Ink500)
.FontSize(11f).Alignment(TextAlignment.MiddleCenter);
.Width(28).Height(28)
.Icon(paper, tpl.OrigamiIcon, EditorTheme.Ink500, size: 24f);

paper.Box($"scr_tpl_name_{i}")
.Width(UnitValue.Stretch()).Height(28)
.Text(tpl.Name, font)
Expand Down Expand Up @@ -168,47 +167,22 @@ private static void DrawContent(Paper paper)
// Footer buttons right-aligned Cancel + Create. The Create button is a real
// EditorGUI.Button when valid; when invalid we render a visually-disabled Box
// so the user sees the error hint rather than clicking a dead button.
using (paper.Row("scr_btns").Height(EditorTheme.RowHeight).JustifyContent(LayoutJustification.End).Gap(8).Enter())
using (paper.Row("scr_btns").Height(EditorTheme.RowHeight).JustifyContent(LayoutJustification.End).Margin(0,0,0,8).Gap(8).Enter())
{
Origami.Button(paper, "scr_cancel", Loc.Get("common.cancel"), () => { Modal.Pop(); }).Width(90).Show();

if (ok)
{
using (paper.Box("scr_create")
.Width(110).Height(EditorTheme.RowHeight).Rounded(3)
.BackgroundColor(EditorTheme.Purple400)
.Hovered.BackgroundColor(EditorTheme.Purple500).End()
.BorderWidth(1).BorderColor(EditorTheme.Purple400)
.OnClick(0, (_, _) => DoCreate())
.Enter())

Origami.Button(paper, "scr_create", Loc.Get("launcher.create"), () =>
{
if (font != null)
paper.Box("scr_create_lbl")
.Width(UnitValue.Stretch()).Height(EditorTheme.RowHeight)
.Text(Loc.Get("launcher.create"), font)
.TextColor(EditorTheme.Ink700)
.FontSize(EditorTheme.FontSize)
.Alignment(TextAlignment.MiddleCenter)
.IsNotInteractable();
}
DoCreate();
}).Primary().Width(90).Show();

}
else
{
using (paper.Box("scr_create_disabled")
.Width(110).Height(EditorTheme.RowHeight).Rounded(3)
.BackgroundColor(EditorTheme.Neutral200)
.BorderWidth(1).BorderColor(EditorTheme.Neutral100)
.Enter())
{
if (font != null)
paper.Box("scr_create_dis_lbl")
.Width(UnitValue.Stretch()).Height(EditorTheme.RowHeight)
.Text(Loc.Get("launcher.create"), font)
.TextColor(EditorTheme.Ink300)
.FontSize(EditorTheme.FontSize)
.Alignment(TextAlignment.MiddleCenter)
.IsNotInteractable();
}
Origami.Button(paper, "scr_create_disabled", Loc.Get("launcher.create"), null).Primary().Disabled(true).Width(90).Show();
}
}
}
Expand Down
9 changes: 7 additions & 2 deletions Prowl.Editor/GUI/Registries/ScriptTemplateRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;

using Prowl.OrigamiUI;

namespace Prowl.Editor.GUI;

/// <summary> Attribute applied to a method that generates a script template. Provides metadata for the template entry displayed in the editor. </summary>
Expand All @@ -9,12 +11,13 @@ public sealed class ScriptTemplateAttribute : Attribute
public string Name { get; }
public string Description { get; }
public string Icon { get; }
public IOrigamiIcon OrigamiIcon;
/// <summary> Gets or sets the sort order of this template relative to others. </summary>
public int Order { get; set; }

public ScriptTemplateAttribute(string name, string description, string icon)
{
Name = name; Description = description; Icon = icon;
Name = name; Description = description; Icon = icon; OrigamiIcon = new EditorGlyphIcon(Icon);
}
}

Expand All @@ -24,13 +27,15 @@ public sealed class ScriptTemplate
public string Name { get; }
public string Description { get; }
public string Icon { get; }
public IOrigamiIcon OrigamiIcon;
/// <summary> Gets the sort order of this template relative to others. </summary>
public int Order { get; }
/// <summary> Gets the function that generates the script content from a class name. </summary>
public Func<string, string> Generate { get; }

public ScriptTemplate(string name, string description, string icon, int order, Func<string, string> generate)
{
Name = name; Description = description; Icon = icon; Order = order; Generate = generate;
Name = name; Description = description; Icon = icon;
OrigamiIcon = new EditorGlyphIcon(Icon); Order = order; Generate = generate;
}
}