sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-12 17:17:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix right mouse drag at song select seeking incorrectly with ma… (#5518)

Browse Source 
Fix right mouse drag at song select seeking incorrectly with many beatmaps loaded

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
This commit is contained in:
Dean Herbert 2019-07-30 14:06:02 +09:00 committed by GitHub
commit d5938d3f7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Graphics/Containers/OsuScrollContainer.cs
View File

@ -27,11 +27,12 @@ namespace osu.Game.Graphics.Containers
private bool shouldPerformRightMouseScroll(MouseButtonEvent e) => RightMouseScrollbar && e.Button == MouseButton.Right; private bool shouldPerformRightMouseScroll(MouseButtonEvent e) => RightMouseScrollbar && e.Button == MouseButton.Right;
private void scrollToRelative(float value) => ScrollTo(Clamp((value - Scrollbar.DrawSize[ScrollDim] / 2) / Scrollbar.Size[ScrollDim]), true, DistanceDecayOnRightMouseScrollbar); private void scrollFromMouseEvent(MouseEvent e) =>
ScrollTo(Clamp(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim] / DrawSize[ScrollDim]) * Content.DrawSize[ScrollDim], true, DistanceDecayOnRightMouseScrollbar);
private bool mouseScrollBarDragging; private bool rightMouseDragging;
protected override bool IsDragging => base.IsDragging || mouseScrollBarDragging; protected override bool IsDragging => base.IsDragging || rightMouseDragging;
public OsuScrollContainer(Direction scrollDirection = Direction.Vertical) public OsuScrollContainer(Direction scrollDirection = Direction.Vertical)
: base(scrollDirection) : base(scrollDirection)
@ -42,7 +43,7 @@ namespace osu.Game.Graphics.Containers
{ {
if (shouldPerformRightMouseScroll(e)) if (shouldPerformRightMouseScroll(e))
{ {
scrollToRelative(e.MousePosition[ScrollDim]); scrollFromMouseEvent(e);
return true; return true;
} }
@ -51,9 +52,9 @@ namespace osu.Game.Graphics.Containers
protected override bool OnDrag(DragEvent e) protected override bool OnDrag(DragEvent e)
{ {
if (mouseScrollBarDragging) if (rightMouseDragging)
{ {
scrollToRelative(e.MousePosition[ScrollDim]); scrollFromMouseEvent(e);
return true; return true;
} }
@ -64,7 +65,7 @@ namespace osu.Game.Graphics.Containers
{ {
if (shouldPerformRightMouseScroll(e)) if (shouldPerformRightMouseScroll(e))
{ {
mouseScrollBarDragging = true; rightMouseDragging = true;
return true; return true;
} }
@ -73,9 +74,9 @@ namespace osu.Game.Graphics.Containers
protected override bool OnDragEnd(DragEndEvent e) protected override bool OnDragEnd(DragEndEvent e)
{ {
if (mouseScrollBarDragging) if (rightMouseDragging)
{ {
mouseScrollBarDragging = false; rightMouseDragging = false;
return true; return true;
} }