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

Move the button into a separate class

Browse Source
This commit is contained in:
EVAST9919
2019-05-30 22:55:59 +03:00
parent 73fb28f9f7
commit 2933169614
2 changed files with 134 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
View File

@ -8,15 +8,9 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Framework.Input.Events;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Users; using osu.Game.Users;
using osu.Game.Graphics.Containers;
using System.Collections.Generic;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
{ {
@ -93,121 +87,5 @@ namespace osu.Game.Overlays.Profile.Sections
} }
protected abstract void ShowMore(); protected abstract void ShowMore();
protected class ShowMoreButton : OsuHoverContainer
{
private readonly Box background;
private readonly LoadingAnimation loading;
private readonly FillFlowContainer content;
protected override IEnumerable<Drawable> EffectTargets => new[] { background };
private bool isLoading;
public bool IsLoading
{
get => isLoading;
set
{
if (isLoading == value)
return;
isLoading = value;
if (value)
{
loading.FadeIn(FADE_DURATION, Easing.OutQuint);
content.FadeOut(FADE_DURATION, Easing.OutQuint);
}
else
{
loading.FadeOut(FADE_DURATION, Easing.OutQuint);
content.FadeIn(FADE_DURATION, Easing.OutQuint);
}
}
}
public ShowMoreButton()
{
Anchor = Anchor.TopCentre;
Origin = Anchor.TopCentre;
AutoSizeAxes = Axes.Both;
Children = new Drawable[]
{
new CircularContainer
{
Masking = true,
Size = new Vector2(140, 30),
Children = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
},
content = new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(7),
Children = new Drawable[]
{
new ChevronIcon(),
new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
Text = "show more".ToUpper(),
},
new ChevronIcon(),
}
},
loading = new LoadingAnimation
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(12)
},
}
}
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colors)
{
IdleColour = colors.GreySeafoam;
HoverColour = colors.GreySeafoamLight;
}
protected override bool OnClick(ClickEvent e)
{
IsLoading = true;
return base.OnClick(e);
}
private class ChevronIcon : SpriteIcon
{
private const int bottom_margin = 2;
private const int icon_size = 8;
public ChevronIcon()
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Margin = new MarginPadding { Bottom = bottom_margin };
Size = new Vector2(icon_size);
Icon = FontAwesome.Solid.ChevronDown;
}
[BackgroundDependencyLoader]
private void load(OsuColour colors)
{
Colour = colors.Yellow;
}
}
}
} }
} }

134
osu.Game/Overlays/Profile/Sections/ShowMoreButton.cs Normal file
View File

@ -0,0 +1,134 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osuTK;
using System.Collections.Generic;
namespace osu.Game.Overlays.Profile.Sections
{
public class ShowMoreButton : OsuHoverContainer
{
private readonly Box background;
private readonly LoadingAnimation loading;
private readonly FillFlowContainer content;
protected override IEnumerable<Drawable> EffectTargets => new[] { background };
private bool isLoading;
public bool IsLoading
{
get => isLoading;
set
{
if (isLoading == value)
return;
isLoading = value;
if (value)
{
loading.FadeIn(FADE_DURATION, Easing.OutQuint);
content.FadeOut(FADE_DURATION, Easing.OutQuint);
}
else
{
loading.FadeOut(FADE_DURATION, Easing.OutQuint);
content.FadeIn(FADE_DURATION, Easing.OutQuint);
}
}
}
public ShowMoreButton()
{
Anchor = Anchor.TopCentre;
Origin = Anchor.TopCentre;
AutoSizeAxes = Axes.Both;
Children = new Drawable[]
{
new CircularContainer
{
Masking = true,
Size = new Vector2(140, 30),
Children = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
},
content = new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(7),
Children = new Drawable[]
{
new ChevronIcon(),
new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
Text = "show more".ToUpper(),
},
new ChevronIcon(),
}
},
loading = new LoadingAnimation
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(12)
},
}
}
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colors)
{
IdleColour = colors.GreySeafoam;
HoverColour = colors.GreySeafoamLight;
}
protected override bool OnClick(ClickEvent e)
{
IsLoading = true;
return base.OnClick(e);
}
private class ChevronIcon : SpriteIcon
{
private const int bottom_margin = 2;
private const int icon_size = 8;
public ChevronIcon()
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Margin = new MarginPadding { Bottom = bottom_margin };
Size = new Vector2(icon_size);
Icon = FontAwesome.Solid.ChevronDown;
}
[BackgroundDependencyLoader]
private void load(OsuColour colors)
{
Colour = colors.Yellow;
}
}
}
}