mirror of
https://github.com/osukey/osukey.git
synced 2025-05-06 22:27:25 +09:00
Remove unnecessary container
This commit is contained in:
parent
b80768b44a
commit
ecf70c1707
@ -80,10 +80,6 @@ namespace osu.Game.Screens.Play
|
|||||||
Anchor = Anchor.BottomRight;
|
Anchor = Anchor.BottomRight;
|
||||||
Origin = Anchor.BottomRight;
|
Origin = Anchor.BottomRight;
|
||||||
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new SongProgressDisplay
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
info = new SongProgressInfo
|
info = new SongProgressInfo
|
||||||
@ -107,8 +103,6 @@ namespace osu.Game.Screens.Play
|
|||||||
Origin = Anchor.BottomLeft,
|
Origin = Anchor.BottomLeft,
|
||||||
OnSeek = time => player?.Seek(time),
|
OnSeek = time => player?.Seek(time),
|
||||||
},
|
},
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -188,19 +182,5 @@ namespace osu.Game.Screens.Play
|
|||||||
float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
|
float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
|
||||||
info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
|
info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SongProgressDisplay : Container
|
|
||||||
{
|
|
||||||
public SongProgressDisplay()
|
|
||||||
{
|
|
||||||
// TODO: move actual implementation into this.
|
|
||||||
// exists for skin customisation purposes (interface should be added to this container).
|
|
||||||
|
|
||||||
Masking = true;
|
|
||||||
RelativeSizeAxes = Axes.Both;
|
|
||||||
Anchor = Anchor.BottomCentre;
|
|
||||||
Origin = Anchor.BottomCentre;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user