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

Centralise toolbar size variables and adjust to design.

Browse Source
This commit is contained in:
Dean Herbert
2017-02-08 20:14:17 +09:00
parent 143cfae93a
commit b6398a1c77
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -21,6 +21,8 @@ namespace osu.Game.Overlays.Toolbar
{
public class ToolbarButton : Container
{
public const float WIDTH = Toolbar.HEIGHT * 1.4f;
public FontAwesome Icon
{
get { return DrawableIcon.Icon; }
@ -66,6 +68,9 @@ namespace osu.Game.Overlays.Toolbar
public ToolbarButton()
{
Width = WIDTH;
RelativeSizeAxes = Axes.Y;
Children = new Drawable[]
{
HoverBackground = new Box
@ -80,7 +85,7 @@ namespace osu.Game.Overlays.Toolbar
Direction = FlowDirection.HorizontalOnly,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Padding = new MarginPadding { Left = 20, Right = 20 },
Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 },
Spacing = new Vector2(5),
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
@ -121,9 +126,6 @@ namespace osu.Game.Overlays.Toolbar
}
}
};
RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X;
}
[BackgroundDependencyLoader]