From 2af285e9721d7884f04e3d4dae596e92ef35cb0a Mon Sep 17 00:00:00 2001 From: Cristhofer Marques Date: Tue, 11 Oct 2022 11:49:32 -0300 Subject: [PATCH 1/3] feature added --- .../Windows/Assets/SkeletonMaskWindow.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs index 3627ef70e..a5e3da327 100644 --- a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs +++ b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs @@ -7,6 +7,7 @@ using FlaxEditor.CustomEditors; using FlaxEditor.CustomEditors.Editors; using FlaxEditor.CustomEditors.Elements; using FlaxEditor.GUI; +using FlaxEditor.GUI.Tree; using FlaxEditor.Viewport.Cameras; using FlaxEditor.Viewport.Previews; using FlaxEngine; @@ -166,8 +167,25 @@ namespace FlaxEditor.Windows.Assets var proxy = (PropertiesProxy)Values[0]; int nodeIndex = (int)checkBox.Tag; proxy.NodesMask[nodeIndex] = checkBox.Checked; + if(Input.GetKey(KeyboardKeys.Shift)) + SetTreeChecked(checkBox.Parent as TreeNode, checkBox.Checked); proxy.Window.MarkAsEdited(); } + + private void SetTreeChecked(TreeNode tree, bool state) + { + foreach(var node in tree.Children) + { + if(node is TreeNode) + { + SetTreeChecked(node as TreeNode, state); + } + if(node is CheckBox) + { + (node as CheckBox).Checked = state; + } + } + } } } From b626d3047d90052a09825bc49053b24a6394ab45 Mon Sep 17 00:00:00 2001 From: Cristhofer Marques Date: Tue, 11 Oct 2022 13:08:52 -0300 Subject: [PATCH 2/3] Update SkeletonMaskWindow.cs --- Source/Editor/Windows/Assets/SkeletonMaskWindow.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs index a5e3da327..6246d8f66 100644 --- a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs +++ b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs @@ -180,7 +180,7 @@ namespace FlaxEditor.Windows.Assets { SetTreeChecked(node as TreeNode, state); } - if(node is CheckBox) + else if(node is CheckBox) { (node as CheckBox).Checked = state; } From 0b8a176ff8f9b873a0ab2bddd0d8d7540b1d2044 Mon Sep 17 00:00:00 2001 From: Cristhofer Marques Date: Tue, 11 Oct 2022 14:05:30 -0300 Subject: [PATCH 3/3] Revert "Update SkeletonMaskWindow.cs" This reverts commit b626d3047d90052a09825bc49053b24a6394ab45. --- Source/Editor/Windows/Assets/SkeletonMaskWindow.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs index 6246d8f66..a5e3da327 100644 --- a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs +++ b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs @@ -180,7 +180,7 @@ namespace FlaxEditor.Windows.Assets { SetTreeChecked(node as TreeNode, state); } - else if(node is CheckBox) + if(node is CheckBox) { (node as CheckBox).Checked = state; }