h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Merge pull request #26701 from peppy/adjust-carousel-padding

Browse Source 
Adjust beatmap carousel padding to avoid scrollbar disappearing underneath logo
This commit is contained in:
Bartłomiej Dach 2024-02-28 17:12:15 +01:00 committed by GitHub
commit 1569cd8d1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ namespace osu.Game.Graphics.Containers
} }
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); ScrollTo(Clamp(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim] / DrawSize[ScrollDim] * Content.DrawSize[ScrollDim]), true, DistanceDecayOnRightMouseScrollbar);
protected override ScrollbarContainer CreateScrollbar(Direction direction) => new OsuScrollbar(direction); protected override ScrollbarContainer CreateScrollbar(Direction direction) => new OsuScrollbar(direction);

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

@ -215,6 +215,12 @@ namespace osu.Game.Screens.Select
InternalChild = new OsuContextMenuContainer InternalChild = new OsuContextMenuContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding
{
// Avoid clash between scrollbar and osu! logo.
Top = 10,
Bottom = 100,
},
Children = new Drawable[] Children = new Drawable[]
{ {
setPool, setPool,