From 3ba6867cd21a5e32ea6c03b43d89e9a54a7ff88a Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 14 Mar 2024 17:30:54 +0100 Subject: [PATCH] Minor fixes --- Source/Editor/Windows/SceneTreeWindow.cs | 1 - Source/Engine/UI/GUI/ContainerControl.cs | 2 +- Source/Engine/UI/GUI/Control.Bounds.cs | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Editor/Windows/SceneTreeWindow.cs b/Source/Editor/Windows/SceneTreeWindow.cs index f47cd4243..9231ce970 100644 --- a/Source/Editor/Windows/SceneTreeWindow.cs +++ b/Source/Editor/Windows/SceneTreeWindow.cs @@ -221,7 +221,6 @@ namespace FlaxEditor.Windows { if (!Editor.StateMachine.CurrentState.CanEditScene) return; - ShowContextMenu(node, location); } diff --git a/Source/Engine/UI/GUI/ContainerControl.cs b/Source/Engine/UI/GUI/ContainerControl.cs index 917d200da..c53307c65 100644 --- a/Source/Engine/UI/GUI/ContainerControl.cs +++ b/Source/Engine/UI/GUI/ContainerControl.cs @@ -356,7 +356,7 @@ namespace FlaxEngine.GUI for (int i = _children.Count - 1; i >= 0; i--) { var child = _children[i]; - if (IntersectsChildContent(child, point, out var childLocation)) + if (child.Visible && IntersectsChildContent(child, point, out var childLocation)) { var containerControl = child as ContainerControl; var childAtRecursive = containerControl?.GetChildAtRecursive(childLocation); diff --git a/Source/Engine/UI/GUI/Control.Bounds.cs b/Source/Engine/UI/GUI/Control.Bounds.cs index d76f82308..ec96f89f2 100644 --- a/Source/Engine/UI/GUI/Control.Bounds.cs +++ b/Source/Engine/UI/GUI/Control.Bounds.cs @@ -1,6 +1,7 @@ // Copyright (c) 2012-2024 Wojciech Figat. All rights reserved. using System; +using System.ComponentModel; namespace FlaxEngine.GUI { @@ -382,6 +383,7 @@ namespace FlaxEngine.GUI /// /// Gets or sets the shear transform angles (x, y). Defined in degrees. Shearing happens relative to the control pivot point. /// + [DefaultValue(0.0f)] [ExpandGroups, EditorDisplay("Transform"), EditorOrder(1040), Tooltip("The shear transform angles (x, y). Defined in degrees. Shearing happens relative to the control pivot point.")] public Float2 Shear { @@ -398,6 +400,7 @@ namespace FlaxEngine.GUI /// /// Gets or sets the rotation angle (in degrees). Control is rotated around it's pivot point (middle of the control by default). /// + [DefaultValue(0.0f)] [ExpandGroups, EditorDisplay("Transform"), EditorOrder(1050), Tooltip("The control rotation angle (in degrees). Control is rotated around it's pivot point (middle of the control by default).")] public float Rotation {