mirror of
https://github.com/ppy/osu.git
synced 2025-02-21 06:52:55 +08:00
Only fade header in when hovering a section
Feels less like the controls are interactive when hovering this way.
This commit is contained in:
parent
c7266c74a0
commit
139ff2d6e2
@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Settings
|
|||||||
|
|
||||||
private IBindable<SettingsSection> selectedSection;
|
private IBindable<SettingsSection> selectedSection;
|
||||||
|
|
||||||
private Container content;
|
private OsuSpriteText header;
|
||||||
|
|
||||||
public abstract Drawable CreateIcon();
|
public abstract Drawable CreateIcon();
|
||||||
public abstract LocalisableString Header { get; }
|
public abstract LocalisableString Header { get; }
|
||||||
@ -70,11 +70,12 @@ namespace osu.Game.Overlays.Settings
|
|||||||
{
|
{
|
||||||
new Box
|
new Box
|
||||||
{
|
{
|
||||||
|
Name = "separator",
|
||||||
Colour = new Color4(0, 0, 0, 255),
|
Colour = new Color4(0, 0, 0, 255),
|
||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
Height = border_size,
|
Height = border_size,
|
||||||
},
|
},
|
||||||
content = new Container
|
new Container
|
||||||
{
|
{
|
||||||
Padding = new MarginPadding
|
Padding = new MarginPadding
|
||||||
{
|
{
|
||||||
@ -85,7 +86,7 @@ namespace osu.Game.Overlays.Settings
|
|||||||
AutoSizeAxes = Axes.Y,
|
AutoSizeAxes = Axes.Y,
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OsuSpriteText
|
header = new OsuSpriteText
|
||||||
{
|
{
|
||||||
Font = OsuFont.GetFont(size: header_size),
|
Font = OsuFont.GetFont(size: header_size),
|
||||||
Text = Header,
|
Text = Header,
|
||||||
@ -134,12 +135,17 @@ namespace osu.Game.Overlays.Settings
|
|||||||
|
|
||||||
private void updateContentFade()
|
private void updateContentFade()
|
||||||
{
|
{
|
||||||
float targetFade = 1;
|
float contentFade = 1;
|
||||||
|
float headerFade = 1;
|
||||||
|
|
||||||
if (!isCurrentSection)
|
if (!isCurrentSection)
|
||||||
targetFade = IsHovered ? 0.6f : 0.25f;
|
{
|
||||||
|
contentFade = 0.25f;
|
||||||
|
headerFade = IsHovered ? 0.5f : 0.25f;
|
||||||
|
}
|
||||||
|
|
||||||
content.FadeTo(targetFade, 500, Easing.OutQuint);
|
header.FadeTo(headerFade, 500, Easing.OutQuint);
|
||||||
|
FlowContent.FadeTo(contentFade, 500, Easing.OutQuint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user