Refactor IconPicker to use single 'All Icons' category

EternalDawn1 · EternalDawn1 · commit 2c408148aa3a · 2025-11-27T21:58:53.000+01:00
Removed emoji category tabs and consolidated all emojis into a single 'All Icons' category. This simplifies the UI and internal logic by eliminating category selection and related code.

Remove icon search filter from IconPickerWidget since its unuseable

Eliminated the filter functionality and related UI elements from IconPickerWidget, simplifying pagination and icon retrieval logic. The widget now displays icons by category without search or filter support.

Update IconPickerWidget.cs

Expand emoji lists in IconPickerWidget

Added more symbols and flag emojis to the SymbolsEmojis and FlagsEmojis arrays in IconPickerWidget.cs to provide a broader selection for users.

Improve page handling in IconPickerWidget

Resets page index when switching categories based on filter state and adds robust bounds checking for page numbers in Rebuild(). Also removes unused emoji generation code for clarity.

Handle icon color tags with variable hex length

Added support for both AARRGGBB and RRGGBB formats in icon color tags. Now, color changes properly invalidate the node and fallback to full alpha if only RRGGBB is provided.

Add emoji icon support and session icon storage

Introduces session-only custom icon storage for GameObjects and adds emoji icon support to the icon picker. GameObject icons now prefer persisted tags (with encoding/decoding) and fall back to session storage. The icon picker UI is updated to allow category selection and display emoji icons. Scene tree and inspector logic updated to handle new icon sources and ensure UI updates on icon changes.

Update default icon logic for GameObjects

Default icon selection now considers visible children in addition to components. If a GameObject has children that should show in the hierarchy, 'folder_open' is used; otherwise, 'layers' is used for objects with components, and 'folder' for empty objects.

Update default GameObject icon logic

Changed default icon from 'layers' to 'folder' for GameObjects without components in both inspector and scene tree. The icon now reflects whether a GameObject has components, improving visual clarity.

Add custom icon and color support for GameObjects

Introduces the ability to set both custom icons and colors for GameObjects via tags. Updates the inspector and scene tree to reflect these customizations, and adds a new IconColorPicker popup for selecting icon and color.

Add support for custom GameObject icons via tags

Introduced the ability to set custom icons for GameObjects using tags prefixed with 'icon_'. The GameObject inspector header now allows users to pick an icon, which updates the tag and refreshes the scene tree. The scene tree node rendering logic was updated to display the custom icon if present.
diff --git a/game/addons/tools/Code/Scene/GameObjectInspector/GameObjectHeader/CustomIconStorage.cs b/game/addons/tools/Code/Scene/GameObjectInspector/GameObjectHeader/CustomIconStorage.cs
@@ -0,0 +1,7 @@
+namespace Editor;
+
+public static class CustomIconStorage
+{
+    // Session-only storage of custom icons keyed by GameObject reference
+    public static Dictionary<GameObject, string> Icons = new();
+}
diff --git a/game/addons/tools/Code/Scene/GameObjectInspector/GameObjectHeader/GameObjectHeader.cs b/game/addons/tools/Code/Scene/GameObjectInspector/GameObjectHeader/GameObjectHeader.cs
@@ -1,4 +1,7 @@
-﻿namespace Editor;
+﻿using System.Linq;
+using System.Text;
+
+namespace Editor;
 
 class GameObjectHeader : Widget
 {
@@ -28,6 +31,7 @@ public GameObjectHeader( Widget parent, SerializedObject targetObject ) : base(
 				var left = topRow.AddRow();
 				left.Add( new GameObjectIconButton( this ) );
 			}
+        
 
 			// 2 rows right
 			{
@@ -66,7 +70,6 @@ protected override void OnPaint()
 		Paint.SetBrush( Theme.SurfaceBackground );
 		Paint.DrawRect( LocalRect );
 	}
-
 }
 
 /// <summary>
@@ -79,7 +82,7 @@ protected override void OnPaint()
 	private Drag _drag;
 
 	public GameObjectIconButton( GameObjectHeader parent )
-		: base( "📦" )
+		: base( GetCurrentIcon( parent.Target ), null )
 	{
 		_parent = parent;
 
@@ -88,9 +91,144 @@ public GameObjectIconButton( GameObjectHeader parent )
 		IconSize = 27;
 		Background = Color.Transparent;
 
+		// Use custom color for the button foreground if one is set on the GameObject
+		Foreground = GetCurrentColor( parent.Target );
+
 		IsDraggable = !parent.Target.IsMultipleTargets;
 	}
 
+	private static string GetCurrentIcon( SerializedObject target )
+	{
+		var go = target.Targets.OfType<GameObject>().FirstOrDefault();
+		if ( go is null ) return "folder";
+
+        // Check for persistent icon tag first (saved with the scene)
+        var iconTag = go.Tags.FirstOrDefault( t => t.StartsWith( "icon_" ) );
+        if ( iconTag is not null )
+        {
+            var decoded = Editor.IconTagEncoding.DecodeIconFromTag( iconTag );
+            if ( !string.IsNullOrEmpty( decoded ) )
+                return decoded;
+        }
+
+		// Fallback to session-only storage
+		if ( CustomIconStorage.Icons.TryGetValue( go, out var customIcon ) )
+		{
+			return customIcon;
+		}
+
+		// Default icon based on children and components
+		return go.Children.Where( x => x.ShouldShowInHierarchy() ).Any() ? "📂" : (go.Components.Count > 0 ? "layers" : "📁");
+	}
+
+	private static Color GetCurrentColor( SerializedObject target )
+	{
+		var go = target.Targets.OfType<GameObject>().FirstOrDefault();
+		if ( go is null ) return Color.White;
+
+		var colorTag = go.Tags.FirstOrDefault( t => t.StartsWith( "icon_color_" ) );
+		if ( colorTag is not null )
+		{
+			var hex = colorTag.Substring( 11 ); // Remove "icon_color_"
+			if ( Color.TryParse( $"#{hex}", out var color ) )
+			{
+				return color;
+			}
+		}
+
+		return Color.White;
+	}
+
+	protected override void OnMousePress( MouseEvent e )
+	{
+		if ( e.Button == MouseButtons.Left )
+		{
+			OnIconClicked();
+			e.Accepted = true;
+		}
+
+		base.OnMousePress( e );
+	}
+
+	private void OnIconClicked()
+	{
+		var go = _parent.Target.Targets.OfType<GameObject>().FirstOrDefault();
+		if ( go is null ) return;
+
+		var currentIcon = GetCurrentIcon( _parent.Target );
+		var currentColor = GetCurrentColor( _parent.Target );
+
+		IconColorPicker.OpenPopup( this, currentIcon, currentColor, ( selectedIcon, selectedColor ) =>
+		{
+			// Prepare new tag values
+			var hasChildren = go.Children.Where( x => x.ShouldShowInHierarchy() ).Any();
+			var defaultIcon = hasChildren ? "folder_open" : (go.Components.Count > 0 ? "layers" : "folder");
+            string newIconTag = selectedIcon != defaultIcon ? IconTagEncoding.EncodeIconToTag( selectedIcon ) : null;
+			string newColorTag = null;
+			if ( selectedColor != Color.White )
+			{
+				newColorTag = $"icon_color_{((int)(selectedColor.r * 255)):X2}{((int)(selectedColor.g * 255)):X2}{((int)(selectedColor.b * 255)):X2}{((int)(selectedColor.a * 255)):X2}";
+			}
+
+			// Apply to all selected targets to avoid inconsistent state
+			var targets = _parent.Target.Targets.OfType<GameObject>().ToArray();
+		foreach ( var targetGo in targets )
+			{
+			// Icon (store by Id)
+            if ( selectedIcon == defaultIcon )
+            {
+                CustomIconStorage.Icons.Remove( targetGo );
+            }
+            else
+            {
+                CustomIconStorage.Icons[targetGo] = selectedIcon;
+            }
+
+				// Color tag (keep using tags for color)
+				var existingColorTag = targetGo.Tags.FirstOrDefault( t => t.StartsWith( "icon_color_" ) );
+				if ( existingColorTag is not null )
+				{
+					if ( newColorTag is null || existingColorTag != newColorTag )
+						targetGo.Tags.Remove( existingColorTag );
+				}
+				if ( newColorTag is not null && !targetGo.Tags.Contains( newColorTag ) )
+				{
+					targetGo.Tags.Add( newColorTag );
+				}
+
+				// Icon tag (persisted with the scene)
+				var existingIconTag = targetGo.Tags.FirstOrDefault( t => t.StartsWith( "icon_" ) );
+				if ( existingIconTag is not null )
+				{
+					if ( newIconTag is null || existingIconTag != newIconTag )
+						targetGo.Tags.Remove( existingIconTag );
+				}
+				if ( newIconTag is not null && !targetGo.Tags.Contains( newIconTag ) )
+				{
+					targetGo.Tags.Add( newIconTag );
+				}
+			}
+
+			// Mark the tree item as dirty so it will update its rendering
+			if ( SceneTreeWidget.Current?.TreeView is { } tv )
+			{
+				foreach ( var t in targets )
+				{
+					tv.Dirty( t );
+				}
+				tv.UpdateIfDirty();
+			}
+
+			// Update the button icon and foreground color
+			Icon = selectedIcon;
+			Foreground = selectedColor;
+			Update();
+
+			// Update the scene tree to reflect the change
+			SceneTreeWidget.Current?.TreeView?.Update();
+		} );
+	}
+
 	protected override void OnDragStart()
 	{
 		base.OnDragStart();
@@ -143,3 +281,54 @@ protected override void OnDragStart()
 		drag.Execute();
 	}
 }
+
+/// <summary>
+/// Custom popup for selecting icon and color.
+/// </summary>
+file static class IconColorPicker
+{
+	public static void OpenPopup( Widget parent, string currentIcon, Color currentColor, Action<string, Color> onSelected )
+	{
+		var popup = new PopupWidget( parent );
+		popup.Visible = false;
+		popup.FixedWidth = 300;
+		popup.Layout = Layout.Column();
+		popup.Layout.Margin = 8;
+		popup.Layout.Spacing = 8;
+
+		// Icon Picker
+		var iconPicker = popup.Layout.Add( new IconPickerWidget( popup ), 1 );
+		iconPicker.Icon = currentIcon;
+
+		// Color Picker
+		var colorPicker = popup.Layout.Add( new ColorPicker( popup ) );
+		colorPicker.Value = currentColor;
+
+		// Live update when icon or color changes
+		iconPicker.ValueChanged = ( v ) =>
+		{
+			onSelected?.Invoke( v, colorPicker.Value );
+		};
+
+		colorPicker.ValueChanged = ( c ) =>
+		{
+			onSelected?.Invoke( iconPicker.Icon, c );
+		};
+
+		// Buttons
+		var buttonRow = popup.Layout.AddRow();
+		buttonRow.Spacing = 4;
+
+		var cancelButton = buttonRow.Add( new Button( "Cancel" ) );
+		cancelButton.Clicked += () => popup.Destroy();
+
+		var okButton = buttonRow.Add( new Button.Primary( "OK" ) );
+		okButton.Clicked += () =>
+		{
+			onSelected?.Invoke( iconPicker.Icon, colorPicker.Value );
+			popup.Destroy();
+		};
+
+		popup.OpenAtCursor();
+	}
+}
diff --git a/game/addons/tools/Code/Scene/GameObjectInspector/GameObjectHeader/IconTagEncoding.cs b/game/addons/tools/Code/Scene/GameObjectInspector/GameObjectHeader/IconTagEncoding.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Text;
+
+namespace Editor
+{
+    public static class IconTagEncoding
+    {
+        public static string EncodeIconToTag( string icon )
+        {
+            if ( string.IsNullOrEmpty( icon ) ) return null;
+            var bytes = Encoding.UTF8.GetBytes( icon );
+            var sb = new StringBuilder();
+            sb.Append( "icon_" );
+            foreach ( var b in bytes ) sb.Append( b.ToString( "X2" ) );
+            return sb.ToString();
+        }
+
+        public static string DecodeIconFromTag( string tag )
+        {
+            if ( string.IsNullOrEmpty( tag ) ) return null;
+            if ( !tag.StartsWith( "icon_" ) ) return null;
+            var hex = tag.Substring( 5 );
+            if ( hex.Length == 0 || hex.Length % 2 != 0 ) return null;
+            try
+            {
+                var bytes = new byte[hex.Length / 2];
+                for ( int i = 0; i < bytes.Length; i++ ) bytes[i] = Convert.ToByte( hex.Substring( i * 2, 2 ), 16 );
+                return Encoding.UTF8.GetString( bytes );
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/game/addons/tools/Code/Scene/SceneTree/GameObjectNode.cs b/game/addons/tools/Code/Scene/SceneTree/GameObjectNode.cs
@@ -34,6 +34,27 @@ public override int ValueHash
 			hc.Add( Value.Network.IsOwner );
 			hc.Add( Value.IsProxy );
 			hc.Add( Value.Active );
+		hc.Add( Value.Tags ); // Include tags for custom icon and color changes
+
+		// Include custom icon (from session storage) so changes trigger a node update
+		// Prefer persisted icon tag (saved with scene) so icons survive reloads
+		var iconTag = Value.Tags.FirstOrDefault( t => t.StartsWith( "icon_" ) );
+		if ( iconTag is not null )
+		{
+			var decoded = Editor.IconTagEncoding.DecodeIconFromTag( iconTag );
+			if ( !string.IsNullOrEmpty( decoded ) ) hc.Add( decoded );
+		}
+		else if ( CustomIconStorage.Icons.TryGetValue( Value, out var sessionIcon ) )
+		{
+			hc.Add( sessionIcon );
+		}
+
+		// Also include persisted color tag so color changes invalidate the node
+		var colorTag = Value.Tags.FirstOrDefault( t => t.StartsWith( "icon_color_" ) );
+		if ( colorTag is not null )
+		{
+			hc.Add( colorTag );
+		}
 
 			foreach ( var val in Value.Children )
 			{
@@ -73,7 +94,7 @@ public override void OnPaint( VirtualWidget item )
 		if ( !Value.Active ) opacity *= 0.5f;
 
 		Color pen = Theme.TextControl;
-		string icon = "layers";
+		string icon = Value.Children.Where( x => x.ShouldShowInHierarchy() ).Any() ? "📂" : (Value.Components.Count > 0 ? "layers" : "📁");
 		Color iconColor = Theme.TextControl.WithAlpha( 0.6f );
 		Color overlayIconColor = iconColor;
 
@@ -165,7 +186,6 @@ public override void OnPaint( VirtualWidget item )
 			pen = Theme.Yellow.WithAlpha( 0.6f );
 		}
 
-
 		//
 		// If there's a drag and drop happening, fade out nodes that aren't possible
 		//
@@ -230,8 +250,48 @@ public override void OnPaint( VirtualWidget item )
 
 		var iconSize = 16;
 
-		Paint.Pen = iconColor.WithAlphaMultiplied( opacity );
-		Paint.DrawIcon( r, icon, iconSize, TextFlag.LeftCenter );
+        // Apply custom icon and color overrides (after all default conditions)
+
+
+        // Prefer persisted icon tag (saved with scene)
+        var iconTag = Value.Tags.FirstOrDefault( t => t.StartsWith( "icon_" ) );
+        if ( iconTag is not null )
+        {
+            var decoded = Editor.IconTagEncoding.DecodeIconFromTag( iconTag );
+            if ( !string.IsNullOrEmpty( decoded ) ) icon = decoded;
+        }
+        else if ( CustomIconStorage.Icons.TryGetValue( Value, out var sessionIconValue ) )
+        {
+            icon = sessionIconValue;
+        }
+
+        // Prefer persisted color tag (saved with scene)
+        var colorTag = Value.Tags.FirstOrDefault( t => t.StartsWith( "icon_color_" ) );
+        if ( colorTag is not null )
+        {
+            var hex = colorTag.Substring( 11 ); // Remove "icon_color_"
+            // Expecting AARRGGBB
+            if ( hex.Length == 8 )
+            {
+                if ( Color.TryParse( $"#{hex}", out var parsedColor ) )
+                {
+                    iconColor = parsedColor;
+                    overlayIconColor = parsedColor;
+                }
+            }
+            else if ( hex.Length == 6 )
+            {
+                // fallback RRGGBB -> assume full alpha
+                if ( Color.TryParse( $"#FF{hex}", out var parsedColor ) )
+                {
+                    iconColor = parsedColor;
+                    overlayIconColor = parsedColor;
+                }
+            }
+        }
+
+        Paint.Pen = iconColor.WithAlphaMultiplied( opacity );
+        Paint.DrawIcon( r, icon, iconSize, TextFlag.LeftCenter );
 		if ( !string.IsNullOrEmpty( overlayIcon ) )
 		{
 			var overlayIconRect = r;
@@ -277,6 +337,11 @@ public override void OnPaint( VirtualWidget item )
 
 
 		}
+		// Apply custom icon and color overrides (after all default conditions)
+        if ( CustomIconStorage.Icons.TryGetValue( Value, out var customIcon ) )
+        {
+            icon = customIcon;
+        }
 	}
 
 	public override void OnRename( VirtualWidget item, string text, List<TreeNode> selection = null )
diff --git a/game/addons/tools/Code/Widgets/IconPicker/IconPickerWidget.cs b/game/addons/tools/Code/Widgets/IconPicker/IconPickerWidget.cs
