From 45866e6771e9377b945fa91d4ff53dd496e3c465 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 9 Feb 2023 09:47:27 +0100 Subject: [PATCH] Minor code cleanup #930 --- .../CustomEditors/Editors/ActorTransformEditor.cs | 8 +++++--- Source/Editor/CustomEditors/Editors/Vector3Editor.cs | 12 ++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index ac520fd7a..727575a49 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -78,14 +78,13 @@ namespace FlaxEditor.CustomEditors.Editors /// public class ScaleEditor : Float3Editor { - private Image _linkImage; /// public override void Initialize(LayoutElementsContainer layout) { base.Initialize(layout); - + LinkValues = Editor.Instance.Windows.PropertiesWin.ScaleLinked; _linkImage = new Image @@ -103,7 +102,10 @@ namespace FlaxEditor.CustomEditors.Editors LinkedLabel.SetupContextMenu += (label, menu, editor) => { menu.AddSeparator(); - menu.AddButton(LinkValues ? "Unlink" : "Link", ToggleLink); + if (LinkValues) + menu.AddButton("Unlink", ToggleLink).LinkTooltip("Unlinks scale components from uniform scaling"); + else + menu.AddButton("Link", ToggleLink).LinkTooltip("Links scale components for uniform scaling"); }; // Override colors diff --git a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs index ad67a4b13..bd154056f 100644 --- a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs +++ b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs @@ -97,30 +97,27 @@ namespace FlaxEditor.CustomEditors.Editors return; if (LinkValues) _valueChanged = ValueChanged.X; - OnValueChanged(); } - + private void OnYValueChanged() { if (IsSetBlocked) return; if (LinkValues) _valueChanged = ValueChanged.Y; - OnValueChanged(); } - + private void OnZValueChanged() { if (IsSetBlocked) return; if (LinkValues) _valueChanged = ValueChanged.Z; - OnValueChanged(); } - + private void OnValueChanged() { if (IsSetBlocked) @@ -150,8 +147,7 @@ namespace FlaxEditor.CustomEditors.Editors xValue += valueChange; yValue += valueChange; break; - default: - break; + default: break; } }