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

The engine now uses the SDL2.0 scroll events properly.

Browse Source 
Scroll speed is now a user preference.
This commit is contained in:
Saticmotion
2014-05-12 22:04:18 +02:00
parent bad6a99caf
commit 1bf3f3e03e
14 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
View File

@@ -63,7 +63,6 @@ namespace OpenRA.Mods.Cnc.Widgets
public readonly string PaletteWidget = null;
public readonly string TypesContainer = null;
public readonly float ScrollVelocity = 4f;
public readonly int TabWidth = 30;
public readonly int ArrowWidth = 20;
public Dictionary<string, ProductionTabGroup> Groups;
@@ -182,9 +181,9 @@ namespace OpenRA.Mods.Cnc.Widgets
Game.Renderer.DisableScissor();
}
void Scroll(int direction)
void Scroll(int amount)
{
listOffset += direction * ScrollVelocity;
listOffset += amount * Game.Settings.Game.UIScrollSpeed;
listOffset = Math.Min(0, Math.Max(Bounds.Width - rightButtonRect.Width - leftButtonRect.Width - contentWidth, listOffset));
}
@@ -228,15 +227,9 @@ namespace OpenRA.Mods.Cnc.Widgets
public override bool HandleMouseInput(MouseInput mi)
{
if (mi.Button == MouseButton.WheelDown)
if (mi.Event == MouseInputEvent.Scroll)
{
Scroll(-1);
return true;
}
if (mi.Button == MouseButton.WheelUp)
{
Scroll(1);
Scroll(mi.ScrollDelta);
return true;
}