From e87a96f2b886d0c701ae82247c0d7ad40cdd429e Mon Sep 17 00:00:00 2001 From: rob-v Date: Mon, 10 Apr 2017 19:56:53 +0200 Subject: [PATCH] Fix/Disable Edge scroll while standard (middle mouse) scroll --- OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs index a00f01b046..cab03341da 100644 --- a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs +++ b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs @@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.Widgets var scroll = (joystickScrollEnd.Value - joystickScrollStart.Value).ToFloat2() * rate; worldRenderer.Viewport.Scroll(scroll, false); } - else + else if (!isStandardScrolling) { edgeDirections = ScrollDirection.None; if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus)