RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-10 08:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backbutton improvements

Browse Source
This commit is contained in:
stanriders 2016-11-27 06:50:36 +03:00
parent ba18c9a309
commit 88ead18929
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
osu.Game/Graphics/UserInterface/BackButton.cs
View File

@ -15,12 +15,10 @@ namespace osu.Game.Graphics.UserInterface
class BackButton : ClickableContainer class BackButton : ClickableContainer
{ {
private TextAwesome icon; private TextAwesome icon;
private Vector2 iconPos;
private Box bgBox; private Container leftContainer;
private Container rightContainer;
private Box textBox; private Box textBox;
private Container textContainer;
private SpriteText spriteText;
public Vector2 ExtendLength; public Vector2 ExtendLength;
public Vector2 InitialExtendLength; public Vector2 InitialExtendLength;
@ -32,7 +30,6 @@ namespace osu.Game.Graphics.UserInterface
// [ should be set or should be relative? // [ should be set or should be relative?
InitialExtendLength = new Vector2(40, 0); InitialExtendLength = new Vector2(40, 0);
ExtendLength = new Vector2(60, 0); ExtendLength = new Vector2(60, 0);
iconPos = new Vector2(20, 0);
Width = 80; Width = 80;
//Height = 40; //Height = 40;
@ -40,19 +37,27 @@ namespace osu.Game.Graphics.UserInterface
Children = new Drawable[] Children = new Drawable[]
{ {
bgBox = new Box leftContainer = new Container
{
RelativeSizeAxes = Axes.Y,
Width = InitialExtendLength.X,
Children = new Drawable[]
{
new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = new Color4(195, 40, 140, 255), Colour = new Color4(195, 40, 140, 255),
Shear = new Vector2(0.1f, 0),
}, },
icon = new TextAwesome icon = new TextAwesome
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.Centre,
TextSize = 25, TextSize = 25,
Position = iconPos,
Icon = FontAwesome.fa_osu_left_o Icon = FontAwesome.fa_osu_left_o
}, },
textContainer = new Container }
},
rightContainer = new Container
{ {
Origin = Anchor.TopLeft, Origin = Anchor.TopLeft,
Anchor = Anchor.TopLeft, Anchor = Anchor.TopLeft,
@ -69,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
Shear = new Vector2(0.1f, 0), Shear = new Vector2(0.1f, 0),
EdgeSmoothness = new Vector2(1.5f, 0), EdgeSmoothness = new Vector2(1.5f, 0),
}, },
spriteText = new SpriteText new SpriteText
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -78,17 +83,15 @@ namespace osu.Game.Graphics.UserInterface
} }
} }
}; };
// HACK: because it never uses InitialExtendLength that we give to it on creation
textContainer.Position = Position + InitialExtendLength;
} }
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
icon.ClearTransformations(); icon.ClearTransformations();
textContainer.ClearTransformations(); rightContainer.ClearTransformations();
leftContainer.ClearTransformations();
textContainer.MoveTo(Position + ExtendLength, transformTime, EasingTypes.OutElastic); rightContainer.MoveTo(Position + ExtendLength, transformTime, EasingTypes.OutElastic);
icon.MoveToX(iconPos.X + 10, transformTime, EasingTypes.OutElastic); leftContainer.ResizeTo(new Vector2(ExtendLength.X, 1.0f), transformTime, EasingTypes.OutElastic);
int duration = 0; //(int)(Game.Audio.BeatLength / 2); int duration = 0; //(int)(Game.Audio.BeatLength / 2);
if (duration == 0) duration = 250; if (duration == 0) duration = 250;
@ -114,10 +117,11 @@ namespace osu.Game.Graphics.UserInterface
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
icon.ClearTransformations(); icon.ClearTransformations();
textContainer.ClearTransformations(); rightContainer.ClearTransformations();
leftContainer.ClearTransformations();
textContainer.MoveTo(Position + InitialExtendLength, transformTime, EasingTypes.OutElastic); rightContainer.MoveTo(Position + InitialExtendLength, transformTime, EasingTypes.OutElastic);
icon.MoveToX(iconPos.X, transformTime, EasingTypes.OutElastic); leftContainer.ResizeTo(new Vector2(InitialExtendLength.X, 1.0f), transformTime, EasingTypes.OutElastic);
} }
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)