From 94334ae52d586dfc3169fe4a4db2ab5a7c07e85d Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 10 Aug 2024 10:02:31 -0500 Subject: [PATCH] Dont zoom in edit game window if shift is clicked and window is not focused --- Source/Editor/Viewport/EditorViewport.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs index c7b845c89..d30fb6cbc 100644 --- a/Source/Editor/Viewport/EditorViewport.cs +++ b/Source/Editor/Viewport/EditorViewport.cs @@ -1612,7 +1612,7 @@ namespace FlaxEditor.Viewport _input.IsPanning = !isAltDown && mbDown && !rbDown; _input.IsRotating = !isAltDown && !mbDown && rbDown; _input.IsMoving = !isAltDown && mbDown && rbDown; - _input.IsZooming = wheelInUse && !_input.IsShiftDown; + _input.IsZooming = wheelInUse && !(_input.IsShiftDown || (!ContainsFocus && FlaxEngine.Input.GetKey(KeyboardKeys.Shift))); _input.IsOrbiting = isAltDown && lbDown && !mbDown && !rbDown; // Control move speed with RMB+Wheel