RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sidebar behaviour feel a bit nicer.

This commit is contained in:
Thomas Müller 2016-11-12 13:08:34 +01:00
parent e923da1998
commit 1c47773e0d
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
osu.Game/Overlays/OptionsOverlay.cs
View File

@ -22,6 +22,7 @@
using osu.Game.Overlays.Options.Graphics;
using osu.Game.Overlays.Options.Input;
using osu.Game.Overlays.Options.Online;
using System;
namespace osu.Game.Overlays
{
@ -112,8 +113,7 @@ public OptionsOverlay()
{
Selected = sections[0] == section,
Section = section,
Action = () => scrollContainer.ScrollTo(
scrollContainer.GetChildYInContent(section) - scrollContainer.DrawSize.Y / 2),
Action = () => scrollContainer.ScrollIntoView(section),
}
).ToArray()
}
@ -130,26 +130,31 @@ protected override void Update()
{
base.Update();
if (scrollContainer.Current != lastKnownScroll)
float currentScroll = scrollContainer.Current;
if (currentScroll != lastKnownScroll)
{
lastKnownScroll = scrollContainer.Current;
lastKnownScroll = currentScroll;
for (int i = sections.Length - 1; i >= 0; i--)
OptionsSection bestCandidate = null;
float bestDistance = float.MaxValue;
foreach (OptionsSection section in sections)
{
var section = sections[i];
float y = scrollContainer.GetChildYInContent(section) - scrollContainer.Current;
if (y <= scrollContainer.DrawSize.Y / 2 + 25)
float distance = Math.Abs(scrollContainer.GetChildYInContent(section) - currentScroll);
if (distance < bestDistance)
{
var previous = sidebarButtons.SingleOrDefault(sb => sb.Selected);
var next = sidebarButtons.SingleOrDefault(sb => sb.Section == section);
if (next != null)
{
previous.Selected = false;
next.Selected = true;
}
break;
bestDistance = distance;
bestCandidate = section;
}
}
var previous = sidebarButtons.SingleOrDefault(sb => sb.Selected);
var next = sidebarButtons.SingleOrDefault(sb => sb.Section == bestCandidate);
if (next != null)
{
previous.Selected = false;
next.Selected = true;
}
}
}