epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress unrelated mouse events while scrolling.

Browse Source
This commit is contained in:
Paul Chote
2017-07-06 17:55:50 +00:00
committed by reaperrr
parent f341330d5e
commit cd9ef47f94
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
View File

@@ -297,13 +297,13 @@ namespace OpenRA.Mods.Common.Widgets
var scrollType = MouseScrollType.Disabled; var scrollType = MouseScrollType.Disabled;
if (mi.Button == MouseButton.Middle || mi.Button == (MouseButton.Left | MouseButton.Right)) if (mi.Button.HasFlag(MouseButton.Middle) || mi.Button.HasFlag(MouseButton.Left | MouseButton.Right))
scrollType = Game.Settings.Game.MiddleMouseScroll; scrollType = Game.Settings.Game.MiddleMouseScroll;
else if (mi.Button == MouseButton.Right) else if (mi.Button.HasFlag(MouseButton.Right))
scrollType = Game.Settings.Game.RightMouseScroll; scrollType = Game.Settings.Game.RightMouseScroll;
if (scrollType == MouseScrollType.Disabled) if (scrollType == MouseScrollType.Disabled)
return false; return IsJoystickScrolling || isStandardScrolling;
if (scrollType == MouseScrollType.Standard || scrollType == MouseScrollType.Inverted) if (scrollType == MouseScrollType.Standard || scrollType == MouseScrollType.Inverted)
{ {
@@ -358,7 +358,7 @@ namespace OpenRA.Mods.Common.Widgets
} }
} }
return false; return IsJoystickScrolling || isStandardScrolling;
} }
public override bool YieldMouseFocus(MouseInput mi) public override bool YieldMouseFocus(MouseInput mi)