sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Applied suggested changes

Browse Source
This commit is contained in:
EVAST9919
2017-05-30 12:23:53 +03:00
parent 963d6e9e8f
commit e737ded382
10 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/UserInterface/SimpleButton.cs → osu.Game/Graphics/UserInterface/IconButton.cs
View File

@ -12,7 +12,7 @@ using osu.Framework.Input;
namespace osu.Game.Graphics.UserInterface
{
public class SimpleButton : ClickableContainer
public class IconButton : ClickableContainer
{
private readonly TextAwesome icon;
private readonly Box hover;
@ -33,7 +33,7 @@ namespace osu.Game.Graphics.UserInterface
set { icon.Scale = value; }
}
public SimpleButton()
public IconButton()
{
AutoSizeAxes = Axes.Both;

123
osu.Game/Graphics/UserInterface/SettingsDropdownContainer.cs
View File

@ -1,123 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Graphics.UserInterface
{
public abstract class SettingsDropdownContainer : Container
{
/// <summary>
/// The title of this container, which will be written in header.
/// </summary>
protected abstract string Title { get; }
private const float transition_duration = 600;
private const int container_width = 270;
private const int border_thickness = 2;
private const int header_height = 30;
private const int corner_radius = 5;
private FillFlowContainer content;
private SimpleButton button;
private bool buttonIsActive;
private Color4 buttonActiveColour;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AutoSizeAxes = Axes.Y;
Width = container_width;
Masking = true;
CornerRadius = corner_radius;
BorderColour = Color4.Black;
BorderThickness = border_thickness;
InternalChildren = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.5f,
},
new FillFlowContainer
{
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
new Container
{
Name = @"Header",
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
Height = header_height,
Children = new Drawable[]
{
new OsuSpriteText
{
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
Text = Title.ToUpper(),
TextSize = 17,
Font = @"Exo2.0-Bold",
Margin = new MarginPadding { Left = 10 },
},
button = new SimpleButton
{
Origin = Anchor.Centre,
Anchor = Anchor.CentreRight,
Position = new Vector2(-15,0),
Icon = FontAwesome.fa_bars,
Scale = new Vector2(0.75f),
Colour = buttonActiveColour = colours.Yellow,
Action = triggerContentVisibility,
},
}
},
content = new FillFlowContainer
{
Name = @"Content",
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
AutoSizeDuration = transition_duration,
AutoSizeEasing = EasingTypes.OutQuint,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding(15),
Spacing = new Vector2(0, 15),
}
}
},
};
}
protected override Container<Drawable> Content => content;
private void triggerContentVisibility()
{
content.ClearTransforms();
content.AutoSizeAxes = buttonIsActive ? Axes.Y : Axes.None;
if (!buttonIsActive)
content.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint);
button.FadeColour(buttonIsActive ? buttonActiveColour : Color4.White, 200, EasingTypes.OutQuint);
buttonIsActive = !buttonIsActive;
}
}
}