1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00

Switch to relative sizes

This commit is contained in:
stanriders 2016-11-29 20:27:59 +03:00
parent a47507fff3
commit 988a9bbaad

View File

@ -24,23 +24,19 @@ namespace osu.Game.Graphics.UserInterface
private const float shear = 0.1f; private const float shear = 0.1f;
private const int extend_length = 60; private static readonly Vector2 size_extended = new Vector2(140, 50);
private const int initial_extend_length = 40; private static readonly Vector2 size_retracted = new Vector2(100, 50);
private const int width_extended = 140;
private const int width_retracted = 120;
public BackButton() public BackButton()
{ {
Width = width_retracted; Size = size_retracted;
Height = 50; // same as bottomToolHeight in PlaySongSelect
Children = new Drawable[] Children = new Drawable[]
{ {
leftContainer = new Container leftContainer = new Container
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Both,
Width = initial_extend_length, Width = 0.4f,
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
@ -59,11 +55,10 @@ namespace osu.Game.Graphics.UserInterface
}, },
rightContainer = new Container rightContainer = new Container
{ {
Origin = Anchor.TopLeft, Origin = Anchor.TopRight,
Anchor = Anchor.TopLeft, Anchor = Anchor.TopRight,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Both,
Width = 80, Width = 0.6f,
Position = Position + new Vector2(initial_extend_length, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
@ -89,10 +84,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
icon.ClearTransformations(); icon.ClearTransformations();
rightContainer.MoveToX(Position.X + extend_length, transform_time, EasingTypes.OutElastic); ResizeTo(size_extended, transform_time, EasingTypes.OutElastic);
leftContainer.ResizeTo(new Vector2(extend_length, 1.0f), transform_time, EasingTypes.OutElastic);
Width = width_extended; // right container + ExtendLength
int duration = 0; //(int)(Game.Audio.BeatLength / 2); int duration = 0; //(int)(Game.Audio.BeatLength / 2);
if (duration == 0) duration = pulse_length; if (duration == 0) duration = pulse_length;
@ -119,12 +111,9 @@ namespace osu.Game.Graphics.UserInterface
{ {
icon.ClearTransformations(); icon.ClearTransformations();
rightContainer.MoveToX(Position.X + initial_extend_length, transform_time, EasingTypes.OutElastic); ResizeTo(size_retracted, transform_time, EasingTypes.OutElastic);
leftContainer.ResizeTo(new Vector2(initial_extend_length, 1.0f), transform_time, EasingTypes.OutElastic);
Width = width_retracted; // right container + InitialExtendLength int duration = 0; //(int)(Game.Audio.BeatLength);
int duration = 0; //(int)(Game.Audio.BeatLength / 2);
if (duration == 0) duration = pulse_length * 2; if (duration == 0) duration = pulse_length * 2;
double offset = 0; //(1 - Game.Audio.SyncBeatProgress) * duration; double offset = 0; //(1 - Game.Audio.SyncBeatProgress) * duration;