h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 11:52:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #17579 from CenTdemeern1/clock-button

Browse Source 
Make the toolbar clock feel more like a button
This commit is contained in:
Dean Herbert 2022-04-01 13:12:48 +09:00 committed by GitHub
commit 6b9f5812a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
osu.Game/Overlays/Toolbar/ToolbarClock.cs
View File

@ -3,27 +3,35 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osuTK; using osuTK;
using osuTK.Graphics;
namespace osu.Game.Overlays.Toolbar namespace osu.Game.Overlays.Toolbar
{ {
public class ToolbarClock : CompositeDrawable public class ToolbarClock : OsuClickableContainer
{ {
private Bindable<ToolbarClockDisplayMode> clockDisplayMode; private Bindable<ToolbarClockDisplayMode> clockDisplayMode;
private Box hoverBackground;
private Box flashBackground;
private DigitalClockDisplay digital; private DigitalClockDisplay digital;
private AnalogClockDisplay analog; private AnalogClockDisplay analog;
public ToolbarClock() public ToolbarClock()
: base(HoverSampleSet.Toolbar)
{ {
RelativeSizeAxes = Axes.Y; RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
Padding = new MarginPadding(10);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -31,23 +39,41 @@ namespace osu.Game.Overlays.Toolbar
{ {
clockDisplayMode = config.GetBindable<ToolbarClockDisplayMode>(OsuSetting.ToolbarClockDisplayMode); clockDisplayMode = config.GetBindable<ToolbarClockDisplayMode>(OsuSetting.ToolbarClockDisplayMode);
InternalChild = new FillFlowContainer Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.Y, hoverBackground = new Box
AutoSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
Children = new Drawable[]
{ {
analog = new AnalogClockDisplay RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(80).Opacity(180),
Blending = BlendingParameters.Additive,
Alpha = 0,
},
flashBackground = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
Colour = Color4.White.Opacity(100),
Blending = BlendingParameters.Additive,
},
new FillFlowContainer
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
Padding = new MarginPadding(10),
Children = new Drawable[]
{ {
Anchor = Anchor.CentreLeft, analog = new AnalogClockDisplay
Origin = Anchor.CentreLeft, {
}, Anchor = Anchor.CentreLeft,
digital = new DigitalClockDisplay Origin = Anchor.CentreLeft,
{ },
Anchor = Anchor.CentreLeft, digital = new DigitalClockDisplay
Origin = Anchor.CentreLeft, {
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
}
} }
} }
}; };
@ -72,8 +98,25 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)
{ {
flashBackground.FadeOutFromOne(800, Easing.OutQuint);
cycleDisplayMode(); cycleDisplayMode();
return true;
return base.OnClick(e);
}
protected override bool OnHover(HoverEvent e)
{
hoverBackground.FadeIn(200);
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
hoverBackground.FadeOut(200);
base.OnHoverLost(e);
} }
private void cycleDisplayMode() private void cycleDisplayMode()