diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs index 171a9e9cc3..e1914d4b8c 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs @@ -18,10 +18,7 @@ namespace osu.Desktop.VisualTests { base.Reset(); - var overlay = new BeatmapOptionsOverlay - { - RelativeSizeAxes = Axes.Both, - }; + var overlay = new BeatmapOptionsOverlay(); Add(overlay); diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs index 655158135d..18fccb708f 100644 --- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs @@ -17,9 +17,8 @@ namespace osu.Game.Screens.Select.Options { private const float transition_duration = 500; private const float x_position = 290; - private const float height = 100; - private Container background; + private Box holder; private FillFlowContainer buttonsContainer; public Action OnRemoveFromUnplayed; @@ -36,7 +35,8 @@ namespace osu.Game.Screens.Select.Options buttonsContainer.Alpha = 1; - background.FadeIn(transition_duration, EasingTypes.OutQuint); + holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, EasingTypes.OutQuint); + buttonsContainer.MoveToX(x_position, transition_duration, EasingTypes.OutQuint); buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, EasingTypes.OutQuint); } @@ -45,7 +45,8 @@ namespace osu.Game.Screens.Select.Options { base.PopOut(); - background.FadeOut(transition_duration, EasingTypes.InSine); + holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, EasingTypes.InSine); + buttonsContainer.MoveToX(DrawWidth, transition_duration, EasingTypes.InSine); buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, EasingTypes.InSine); @@ -59,19 +60,21 @@ namespace osu.Game.Screens.Select.Options public BeatmapOptionsOverlay() { + AutoSizeAxes = Axes.Y; + RelativeSizeAxes = Axes.X; + Anchor = Anchor.BottomLeft; + Origin = Anchor.BottomLeft; + Children = new Drawable[] { - background = new Container + holder = new Box { + Origin = Anchor.BottomLeft, + Anchor = Anchor.BottomLeft, RelativeSizeAxes = Axes.Both, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.Black.Opacity(0.5f), - }, - }, + Height = 0.5f, + Scale = new Vector2(1, 0), + Colour = Color4.Black.Opacity(0.5f), }, buttonsContainer = new FillFlowContainer { diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index e7f6b6fac2..a60c39d61b 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -129,9 +129,6 @@ namespace osu.Game.Screens.Select }, beatmapOptions = new BeatmapOptionsOverlay { - RelativeSizeAxes = Axes.Both, - Anchor = Anchor.BottomCentre, - Origin = Anchor.BottomCentre, OnRemoveFromUnplayed = null, OnClearLocalScores = null, OnEdit = null,