h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 02:23:10 +08:00
Code Issues Releases Wiki Activity

Merge pull request #30757 from peppy/fix-scroll-absolute-pos

Browse Source 
Fix right click scroll at song select not quite matching scrollbar position
This commit is contained in:
Bartłomiej Dach 2024-11-19 10:40:00 +01:00 committed by GitHub
commit 273095fd82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,6 @@ namespace osu.Game.Graphics.Containers
/// </summary> /// </summary>
public double DistanceDecayOnRightMouseScrollbar = 0.02; public double DistanceDecayOnRightMouseScrollbar = 0.02;
private bool shouldPerformRightMouseScroll(MouseButtonEvent e) => RightMouseScrollbar && e.Button == MouseButton.Right;
private bool rightMouseDragging; private bool rightMouseDragging;
protected override bool IsDragging => base.IsDragging || rightMouseDragging; protected override bool IsDragging => base.IsDragging || rightMouseDragging;
@ -126,8 +124,15 @@ namespace osu.Game.Graphics.Containers
return base.OnScroll(e); return base.OnScroll(e);
} }
protected virtual void ScrollFromMouseEvent(MouseEvent e) => protected virtual void ScrollFromMouseEvent(MouseEvent e)
ScrollTo(Clamp(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim] / DrawSize[ScrollDim] * Content.DrawSize[ScrollDim]), true, DistanceDecayOnRightMouseScrollbar); {
float fromScrollbarPosition = FromScrollbarPosition(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim]);
float scrollbarCentreOffset = FromScrollbarPosition(Scrollbar.DrawHeight) * 0.5f;
ScrollTo(Clamp(fromScrollbarPosition - scrollbarCentreOffset), true, DistanceDecayOnRightMouseScrollbar);
}
private bool shouldPerformRightMouseScroll(MouseButtonEvent e) => RightMouseScrollbar && e.Button == MouseButton.Right;
protected override ScrollbarContainer CreateScrollbar(Direction direction) => new OsuScrollbar(direction); protected override ScrollbarContainer CreateScrollbar(Direction direction) => new OsuScrollbar(direction);

3
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -245,8 +245,7 @@ namespace osu.Game.Screens.Select
config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm); config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled); config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
RightClickScrollingEnabled.ValueChanged += enabled => Scroll.RightMouseScrollbar = enabled.NewValue; RightClickScrollingEnabled.BindValueChanged(enabled => Scroll.RightMouseScrollbar = enabled.NewValue, true);
RightClickScrollingEnabled.TriggerChange();
if (detachedBeatmapStore != null && detachedBeatmapSets == null) if (detachedBeatmapStore != null && detachedBeatmapSets == null)
{ {