From 00fdffe9c8fbb532da942d3d1a486de7214853ea Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 4 Mar 2017 23:24:13 +0900 Subject: [PATCH] Update framework (and fix non-conforming anchors in FillFlowContainers). --- osu-framework | 2 +- osu.Game/Beatmaps/Drawables/BeatmapPanel.cs | 2 -- .../Options/Sections/MaintenanceSection.cs | 18 +++++++++++++----- osu.Game/Screens/Play/PauseOverlay.cs | 13 ++++++++----- osu.Game/Screens/Select/FilterControl.cs | 6 ++---- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/osu-framework b/osu-framework index a0be700a68..288236eaba 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a0be700a68bfb75bb27350cc7fe2e7e758b8645c +Subproject commit 288236eaba95dfa15268a55f38c009a97d806f25 diff --git a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs index a4447fb57c..f110fc37ac 100644 --- a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs @@ -95,8 +95,6 @@ namespace osu.Game.Beatmaps.Drawables new DifficultyIcon(beatmap) { Scale = new Vector2(1.8f), - Anchor = Anchor.CentreLeft, - Origin = Anchor.CentreLeft, }, new FillFlowContainer { diff --git a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs index 5393c42843..6aa9b66f5c 100644 --- a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs +++ b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs @@ -39,12 +39,20 @@ namespace osu.Game.Overlays.Options.Sections RelativeSizeAxes = Axes.X, Text = "Run osu! updater", }, - new OptionLabel + new Container { - Text = "TODO: osu version here", - Anchor = Anchor.TopCentre, - Origin = Anchor.TopCentre, - }, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, + Children = new[] + { + new OptionLabel + { + Text = "osu!lazer", + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + }, + } + } }; } } diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs index 970d825612..0561581670 100644 --- a/osu.Game/Screens/Play/PauseOverlay.cs +++ b/osu.Game/Screens/Play/PauseOverlay.cs @@ -113,11 +113,12 @@ namespace osu.Game.Screens.Play { new FillFlowContainer { - AutoSizeAxes = Axes.Both, - Direction = FillDirection.Vertical, - Spacing = new Vector2(0, 20), Origin = Anchor.TopCentre, Anchor = Anchor.TopCentre, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, + Direction = FillDirection.Vertical, + Spacing = new Vector2(0, 20), Children = new Drawable[] { new OsuSpriteText @@ -144,6 +145,8 @@ namespace osu.Game.Screens.Play }, new FillFlowContainer { + Origin = Anchor.TopCentre, + Anchor = Anchor.TopCentre, RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Masking = true, @@ -188,9 +191,9 @@ namespace osu.Game.Screens.Play }, retryCounterContainer = new FillFlowContainer { - AutoSizeAxes = Axes.Both, Origin = Anchor.TopCentre, - Anchor = Anchor.TopCentre + Anchor = Anchor.TopCentre, + AutoSizeAxes = Axes.Both, } } }, diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs index 3b8fa4c3c5..af47e73788 100644 --- a/osu.Game/Screens/Select/FilterControl.cs +++ b/osu.Game/Screens/Select/FilterControl.cs @@ -210,10 +210,9 @@ namespace osu.Game.Screens.Select groupsEllipsis = new TextAwesome { Icon = FontAwesome.fa_ellipsis_h, + Origin = Anchor.TopLeft, TextSize = 14, Margin = new MarginPadding { Top = 5, Bottom = 5 }, - Origin = Anchor.BottomLeft, - Anchor = Anchor.BottomLeft, } } }, @@ -241,10 +240,9 @@ namespace osu.Game.Screens.Select sortEllipsis = new TextAwesome { Icon = FontAwesome.fa_ellipsis_h, + Origin = Anchor.TopLeft, TextSize = 14, Margin = new MarginPadding { Top = 5, Bottom = 5 }, - Origin = Anchor.BottomLeft, - Anchor = Anchor.BottomLeft, } } },