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

Adjust back button to match style better

Browse Source
This commit is contained in:
Dean Herbert 2023-12-27 02:54:24 +09:00
parent 8e13f65c5d
commit 5d0b524794
No known key found for this signature in database
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Overlays/Settings/SidebarButton.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -23,6 +24,7 @@ namespace osu.Game.Overlays.Settings
private void load() private void load()
{ {
BackgroundColour = ColourProvider.Background5; BackgroundColour = ColourProvider.Background5;
Hover.Colour = ColourProvider.Light4;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -40,6 +42,9 @@ namespace osu.Game.Overlays.Settings
protected override void OnHoverLost(HoverLostEvent e) => UpdateState(); protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
protected abstract void UpdateState(); protected virtual void UpdateState()
{
Hover.FadeTo(IsHovered ? 0.1f : 0, FADE_DURATION, Easing.OutQuint);
}
} }
} }

3
osu.Game/Overlays/Settings/SidebarIconButton.cs
View File

@ -111,12 +111,11 @@ namespace osu.Game.Overlays.Settings
private void load() private void load()
{ {
selectionIndicator.Colour = ColourProvider.Highlight1; selectionIndicator.Colour = ColourProvider.Highlight1;
Hover.Colour = ColourProvider.Light4;
} }
protected override void UpdateState() protected override void UpdateState()
{ {
Hover.FadeTo(IsHovered ? 0.1f : 0, FADE_DURATION, Easing.OutQuint); base.UpdateState();
if (Selected) if (Selected)
{ {

13
osu.Game/Overlays/SettingsSubPanel.cs
View File

@ -47,7 +47,9 @@ namespace osu.Game.Overlays
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Size = new Vector2(SettingsSidebar.DEFAULT_WIDTH); Size = new Vector2(SettingsSidebar.EXPANDED_WIDTH);
Padding = new MarginPadding(5);
AddRange(new Drawable[] AddRange(new Drawable[]
{ {
@ -61,7 +63,8 @@ namespace osu.Game.Overlays
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(15), Y = -5,
Size = new Vector2(30),
Shadow = true, Shadow = true,
Icon = FontAwesome.Solid.ChevronLeft Icon = FontAwesome.Solid.ChevronLeft
}, },
@ -69,8 +72,8 @@ namespace osu.Game.Overlays
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = 15, Y = 30,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold), Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
Text = @"back", Text = @"back",
}, },
} }
@ -80,6 +83,8 @@ namespace osu.Game.Overlays
protected override void UpdateState() protected override void UpdateState()
{ {
base.UpdateState();
content.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint); content.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint);
} }
} }