Merge pull request #13096 from rob-v/DisableEdgeScrollWhileStandardScroll

Fix/Disable Edge scroll while standard (middle mouse) scroll
This commit is contained in:
reaperrr
2017-04-17 14:36:21 +02:00
committed by GitHub

View File

@@ -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)