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

Add revert-to-default glow for settings items

Browse Source
This commit is contained in:
Shane Woolcock 2017-10-21 12:42:11 +10:30
parent da5e7766fb
commit 2c7343e965
3 changed files with 89 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -2,17 +2,23 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Allocation;
using OpenTK.Graphics;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays.Settings
{
public abstract class SettingsItem<T> : FillFlowContainer, IFilterable
public abstract class SettingsItem<T> : Container, IFilterable
{
protected abstract Drawable CreateControl();
@ -20,8 +26,16 @@ namespace osu.Game.Overlays.Settings
private IHasCurrentValue<T> controlWithCurrent => Control as IHasCurrentValue<T>;
protected override Container<Drawable> Content => FlowContent;
protected readonly FillFlowContainer FlowContent;
private SpriteText text;
private readonly SettingsItemDefaultIndicator<T> defaultIndicator = new SettingsItemDefaultIndicator<T>();
public bool ShowsDefaultIndicator = true;
public virtual string LabelText
{
get { return text?.Text ?? string.Empty; }
@ -51,6 +65,11 @@ namespace osu.Game.Overlays.Settings
{
bindable = value;
controlWithCurrent?.Current.BindTo(bindable);
if (ShowsDefaultIndicator)
{
defaultIndicator.Bindable.BindTo(bindable);
defaultIndicator.Bindable.TriggerChange();
}
}
}
@ -69,14 +88,78 @@ namespace osu.Game.Overlays.Settings
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Padding = new MarginPadding { Right = 5 };
Padding = new MarginPadding { Right = SettingsOverlay.CONTENT_MARGINS };
FlowContent = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Left = SettingsOverlay.CONTENT_MARGINS, Right = 5 },
};
if ((Control = CreateControl()) != null)
{
if (controlWithCurrent != null)
controlWithCurrent.Current.DisabledChanged += disabled => { Colour = disabled ? Color4.Gray : Color4.White; };
Add(Control);
FlowContent.Add(Control);
}
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AddInternal(FlowContent);
if (defaultIndicator != null)
{
defaultIndicator.Colour = ColourInfo.GradientHorizontal(colours.Yellow.Opacity(0.8f), colours.Yellow.Opacity(0));
defaultIndicator.Alpha = 0f;
AddInternal(defaultIndicator);
}
}
private class SettingsItemDefaultIndicator<T> : Box
{
internal readonly Bindable<T> Bindable = new Bindable<T>();
private bool hovering;
public SettingsItemDefaultIndicator()
{
Bindable.ValueChanged += value => updateAlpha();
RelativeSizeAxes = Axes.Y;
Width = SettingsOverlay.CONTENT_MARGINS;
Alpha = 0f;
}
public override bool HandleInput => true;
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) => true;
protected override bool OnClick(InputState state)
{
Bindable.SetDefault();
return true;
}
protected override bool OnHover(InputState state)
{
hovering = true;
updateAlpha();
return true;
}
protected override void OnHoverLost(InputState state)
{
hovering = false;
updateAlpha();
}
private void updateAlpha() =>
Alpha = Bindable.IsDefault ? 0f : hovering ? 1f : 0.5f;
}
}
}

5
osu.Game/Overlays/Settings/SettingsSection.cs
View File

@ -69,8 +69,6 @@ namespace osu.Game.Overlays.Settings
Padding = new MarginPadding
{
Top = 20 + border_size,
Left = SettingsOverlay.CONTENT_MARGINS,
Right = SettingsOverlay.CONTENT_MARGINS,
Bottom = 10,
},
RelativeSizeAxes = Axes.X,
@ -81,7 +79,8 @@ namespace osu.Game.Overlays.Settings
{
TextSize = header_size,
Text = Header,
Colour = colours.Yellow
Colour = colours.Yellow,
Margin = new MarginPadding { Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS }
},
FlowContent
}

2
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Settings
new OsuSpriteText
{
Text = Header.ToUpper(),
Margin = new MarginPadding { Bottom = 10 },
Margin = new MarginPadding { Bottom = 10, Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS },
Font = @"Exo2.0-Black",
},
FlowContent