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

Focus the ViewportController on Standard/Inverted scroll modes.

Browse Source
This commit is contained in:
Paul Chote
2017-08-09 17:58:54 +00:00
committed by abcdefg30
parent d0d8062dbf
commit 22d7031819
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,7 +306,12 @@ namespace OpenRA.Mods.Common.Widgets
if (scrollType == MouseScrollType.Standard || scrollType == MouseScrollType.Inverted) if (scrollType == MouseScrollType.Standard || scrollType == MouseScrollType.Inverted)
{ {
if (mi.Event == MouseInputEvent.Down && !isStandardScrolling) if (mi.Event == MouseInputEvent.Down && !isStandardScrolling)
{
if (!TakeMouseFocus(mi))
return false;
standardScrollStart = mi.Location; standardScrollStart = mi.Location;
}
else if (mi.Event == MouseInputEvent.Move && (isStandardScrolling || else if (mi.Event == MouseInputEvent.Move && (isStandardScrolling ||
(standardScrollStart.HasValue && ((standardScrollStart.Value - mi.Location).Length > Game.Settings.Game.MouseScrollDeadzone)))) (standardScrollStart.HasValue && ((standardScrollStart.Value - mi.Location).Length > Game.Settings.Game.MouseScrollDeadzone))))
{ {
@@ -320,6 +325,7 @@ namespace OpenRA.Mods.Common.Widgets
var wasStandardScrolling = isStandardScrolling; var wasStandardScrolling = isStandardScrolling;
isStandardScrolling = false; isStandardScrolling = false;
standardScrollStart = null; standardScrollStart = null;
YieldMouseFocus(mi);
if (wasStandardScrolling) if (wasStandardScrolling)
return true; return true;
@@ -333,6 +339,7 @@ namespace OpenRA.Mods.Common.Widgets
{ {
if (!TakeMouseFocus(mi)) if (!TakeMouseFocus(mi))
return false; return false;
joystickScrollStart = mi.Location; joystickScrollStart = mi.Location;
} }