Merge branch 'FlaxEngine:master' into missing_script_replacement

Source/Editor/CustomEditors/Elements/DoubleValueElement.cs

@@ -22,7 +22,7 @@ namespace FlaxEditor.CustomEditors.Elements
         /// <summary>
         /// [Deprecated on 26.05.2022, expires on 26.05.2024]
         /// </summary>
-        [System.Obsolete("Deprecated in 1.4")]
+        [System.Obsolete("Deprecated in 1.4, use ValueBox instead")]
         public DoubleValueBox DoubleValue => ValueBox;
 
         /// <summary>

Source/Editor/CustomEditors/Elements/FloatValueElement.cs

@@ -22,7 +22,7 @@ namespace FlaxEditor.CustomEditors.Elements
         /// <summary>
         /// [Deprecated on 26.05.2022, expires on 26.05.2024]
         /// </summary>
-        [System.Obsolete("Deprecated in 1.4, ValueBox instead")]
+        [System.Obsolete("Deprecated in 1.4, use ValueBox instead")]
         public FloatValueBox FloatValue => ValueBox;
 
         /// <summary>

Source/Editor/GUI/Input/ValueBox.cs

@@ -182,6 +182,7 @@ namespace FlaxEditor.GUI.Input
             }
             SlidingEnd?.Invoke();
             Defocus();
+            Parent?.Focus();
         }
 
         /// <inheritdoc />

Source/Editor/Surface/Archetypes/Animation.cs

@@ -59,8 +59,11 @@ namespace FlaxEditor.Surface.Archetypes
                 if (Surface != null)
                 {
                     _assetSelect = GetChild<AssetSelect>();
-                    _assetBox = GetBox(8);
-                    _assetSelect.Visible = !_assetBox.HasAnyConnection;
+                    if (TryGetBox(8, out var box))
+                    {
+                        _assetBox = box;
+                        _assetSelect.Visible = !_assetBox.HasAnyConnection;
+                    }
                     UpdateTitle();
                 }
             }
@@ -68,7 +71,11 @@ namespace FlaxEditor.Surface.Archetypes
             private void UpdateTitle()
             {
                 var asset = Editor.Instance.ContentDatabase.Find((Guid)Values[0]);
-                Title = _assetBox.HasAnyConnection || asset == null ? "Animation" : asset.ShortName;
+                if (_assetBox != null)
+                    Title = _assetBox.HasAnyConnection || asset == null ? "Animation" : asset.ShortName;
+                else
+                    Title = asset?.ShortName ?? "Animation";
+                
                 var style = Style.Current;
                 Resize(Mathf.Max(230, style.FontLarge.MeasureText(Title).X + 30), 160);
             }
@@ -78,6 +85,8 @@ namespace FlaxEditor.Surface.Archetypes
             {
                 base.ConnectionTick(box);
 
+                if (_assetBox == null)
+                    return;
                 if (box.ID != _assetBox.ID)
                     return;
 

Source/Editor/Tools/Terrain/PaintTerrainGizmo.cs

@@ -150,6 +150,12 @@ namespace FlaxEditor.Tools.Terrain
                 return;
             }
 
+            // Increase or decrease brush size with scroll
+            if (Input.GetKey(KeyboardKeys.Shift))
+            {
+                Mode.CurrentBrush.Size += dt * Mode.CurrentBrush.Size * Input.Mouse.ScrollDelta * 5f;
+            }
+
             // Check if no terrain is selected
             var terrain = SelectedTerrain;
             if (!terrain)

Source/Editor/Tools/Terrain/SculptTerrainGizmo.cs

@@ -158,6 +158,12 @@ namespace FlaxEditor.Tools.Terrain
                 return;
             }
 
+            // Increase or decrease brush size with scroll
+            if (Input.GetKey(KeyboardKeys.Shift))
+            {
+                Mode.CurrentBrush.Size += dt * Mode.CurrentBrush.Size * Input.Mouse.ScrollDelta * 5f;
+            }
+
             // Check if selected terrain was changed during painting
             if (terrain != _paintTerrain && IsPainting)
             {

Source/Editor/Viewport/EditorViewport.cs

@@ -1119,7 +1119,12 @@ namespace FlaxEditor.Viewport
             var win = (WindowRootControl)Root;
 
             // Get current mouse position in the view
-            _viewMousePos = PointFromWindow(win.MousePosition);
+            {
+                // When the window is not focused, the position in window does not return sane values
+                Float2 pos = PointFromWindow(win.MousePosition);
+                if (!float.IsInfinity(pos.LengthSquared))
+                    _viewMousePos = pos;
+            }
 
             // Update input
             var window = win.Window;

Source/Editor/Viewport/Previews/AudioClipPreview.cs

@@ -171,7 +171,7 @@ namespace FlaxEditor.Viewport.Previews
                 case DrawModes.Fill:
                     clipsInView = 1.0f;
                     clipWidth = width;
-                    samplesPerIndex = (uint)(samplesPerChannel / width);
+                    samplesPerIndex = (uint)(samplesPerChannel / width) * info.NumChannels;
                     break;
                 case DrawModes.Single:
                     clipsInView = Mathf.Min(clipsInView, 1.0f);

Source/Editor/Windows/Assets/AudioClipWindow.cs

@@ -335,6 +335,22 @@ namespace FlaxEditor.Windows.Assets
             }
         }
 
+        /// <inheritdoc />
+        public override bool OnKeyDown(KeyboardKeys key)
+        {
+            if (base.OnKeyDown(key))
+                return true;
+
+            if (key == KeyboardKeys.Spacebar)
+            {
+                if (_previewSource?.State == AudioSource.States.Playing)
+                    OnPause();
+                else
+                    OnPlay();
+            }
+            return false;
+        }
+
         /// <inheritdoc />
         public override bool UseLayoutData => true;