sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Implement placeholder and correct redraw algorithm

Browse Source
This commit is contained in:
Andrei Zavatski
2019-09-07 08:46:16 +03:00
parent f77cd6582d
commit cea26baaef
2 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
View File

@ -17,9 +17,7 @@ namespace osu.Game.Tests.Visual.UserInterface
public TestScenePageSelector() public TestScenePageSelector()
{ {
PageSelector pageSelector; Child = new PageSelector(200)
Child = pageSelector = new PageSelector(10)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

63
osu.Game/Graphics/UserInterface/PageSelector.cs
View File

@ -3,7 +3,6 @@
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Graphics.Containers;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -16,7 +15,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
public class PageSelector : CompositeDrawable public class PageSelector : CompositeDrawable
{ {
private BindableInt currentPage = new BindableInt(1); public readonly BindableInt CurrentPage = new BindableInt();
private readonly int maxPages; private readonly int maxPages;
private readonly FillFlowContainer pillsFlow; private readonly FillFlowContainer pillsFlow;
@ -38,30 +37,47 @@ namespace osu.Game.Graphics.UserInterface
{ {
base.LoadComplete(); base.LoadComplete();
currentPage.BindValueChanged(page => redraw(page.NewValue), true); CurrentPage.BindValueChanged(_ => redraw(), true);
} }
private void redraw(int newPage) private void redraw()
{ {
pillsFlow.Clear(); pillsFlow.Clear();
for (int i = 1; i <= maxPages; i++) if (CurrentPage.Value > 3)
addDrawablePage(1);
if (CurrentPage.Value > 4)
addPlaceholder();
for (int i = Math.Max(CurrentPage.Value - 2, 1); i <= Math.Min(CurrentPage.Value + 2, maxPages); i++)
{ {
if (i == currentPage.Value) if (i == CurrentPage.Value)
addCurrentPagePill(); addCurrentPagePill();
else else
addPagePill(i); addDrawablePage(i);
} }
if (CurrentPage.Value + 2 < maxPages - 1)
addPlaceholder();
if (CurrentPage.Value + 2 < maxPages)
addDrawablePage(maxPages);
} }
private void addPagePill(int page) private void addDrawablePage(int page)
{ {
pillsFlow.Add(new Page(page.ToString(), () => currentPage.Value = page)); pillsFlow.Add(new Page(page.ToString(), () => CurrentPage.Value = page));
}
private void addPlaceholder()
{
pillsFlow.Add(new Placeholder());
} }
private void addCurrentPagePill() private void addCurrentPagePill()
{ {
pillsFlow.Add(new CurrentPage(currentPage.Value.ToString())); pillsFlow.Add(new SelectedPage(CurrentPage.Value.ToString()));
} }
private abstract class DrawablePage : CompositeDrawable private abstract class DrawablePage : CompositeDrawable
@ -149,13 +165,13 @@ namespace osu.Game.Graphics.UserInterface
}; };
} }
private class CurrentPage : DrawablePage private class SelectedPage : DrawablePage
{ {
private SpriteText text; private SpriteText text;
private Box background; private Box background;
public CurrentPage(string text) public SelectedPage(string text)
: base(text) : base(text)
{ {
} }
@ -184,5 +200,28 @@ namespace osu.Game.Graphics.UserInterface
} }
}; };
} }
private class Placeholder : DrawablePage
{
private SpriteText text;
public Placeholder()
: base("...")
{
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
text.Colour = colours.Seafoam;
}
protected override Drawable CreateContent() => text = new SpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Text = Text
};
}
} }
} }