Merge branch 'Tryibion-master'

Source/Editor/Surface/VisjectSurface.Input.cs

@@ -290,9 +290,23 @@ namespace FlaxEditor.Surface
             // Change scale (disable scaling during selecting nodes)
             if (IsMouseOver && !_leftMouseDown && !IsPrimaryMenuOpened)
             {
-                var viewCenter = ViewCenterPosition;
+                var nextViewScale = ViewScale + delta * 0.1f;
-                ViewScale += delta * 0.1f;
+                
-                ViewCenterPosition = viewCenter;
+                if (delta > 0 && !_rightMouseDown)
+                {
+                    // Scale towards mouse when zooming in
+                    var nextCenterPosition = ViewPosition + location / ViewScale;
+                    ViewScale = nextViewScale;
+                    ViewPosition = nextCenterPosition - (location / ViewScale);
+                }
+                else
+                {
+                    // Scale while keeping center position when zooming out or when dragging view
+                    var viewCenter = ViewCenterPosition;
+                    ViewScale = nextViewScale;
+                    ViewCenterPosition = viewCenter;
+                }
+                
                 return true;
             }