Fix #11070: [Core][Windows] More action buttons displaying backplate …

…instead of setting this as null
EvergineTeam · Jul 25, 2024 · a986de9 · a986de9
1 parent 19a9d98
commit a986de9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/core/Evergine.Xrv.Core/UI/Windows/ActionButtonsOrganizer.cs b/src/core/Evergine.Xrv.Core/UI/Windows/ActionButtonsOrganizer.cs
@@ -6,6 +6,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 using Evergine.Framework;
+using Evergine.MRTK.SDK.Features.UX.Components.Configurators;
 using Evergine.Xrv.Core.Localization;
 using Evergine.Xrv.Core.UI.Buttons;
 
@@ -311,6 +312,13 @@ private void CreateButtonInstanceForContainer(ButtonDescription description, boo
                 {
                     Entity buttonInstance = this.CreateButtonEntity(description, CoreResourcesIDs.Prefabs.iconTextButton_weprefab);
                     buttonInstance.FindComponentInChildren<ButtonCursorFeedback>().HideTextOnCursorLeave = false;
+
+                    foreach (var configurator in buttonInstance.FindComponentsInChildren<StandardButtonConfigurator>())
+                    {
+                        configurator.AllowBackPlateNullMaterial = true;
+                        configurator.Plate = null;
+                    }
+
                     this.instantiatedMoreActionButtons.Add(description.Id, buttonInstance);
                 }
 

diff --git a/src/core/Evergine.Xrv.Core/UI/Windows/Window.cs b/src/core/Evergine.Xrv.Core/UI/Windows/Window.cs
@@ -455,7 +455,8 @@ private void ButtonReleaseHandleForMoreActionsPanelBehavior(object sender, Event
             var senderEntity = (sender as Component)?.Owner;
             if (senderEntity?.FindComponentInParents<ToggleButton>() is ToggleButton toggle)
             {
-                senderEntity = toggle.Owner;
+                // TODO change this, not resistent to hierarchy changes
+                senderEntity = toggle.Owner.Parent?.Parent;
             }
 
             if (senderEntity == null)