h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:13:21 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into osb_loading

Browse Source
This commit is contained in:
Dean Herbert 2017-02-13 18:22:29 +09:00
commit 1aeb48b920
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
31 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LICENCE
View File

@ -1,6 +1,4 @@
The MIT License Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -18,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.

2
osu-framework

@ -1 +1 @@
Subproject commit e776f6f2729bbe93206c4e8c089eeca57522fcf7 Subproject commit 4d7f9b8a3afd32183a31d62143d522d43d8c01ca

2
osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
View File

@ -71,7 +71,7 @@ namespace osu.Desktop.VisualTests.Tests
Add(flow = new FlowContainer Add(flow = new FlowContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Direction = FlowDirection.VerticalOnly Direction = FlowDirections.Vertical
}); });
SpriteText loading; SpriteText loading;

4
osu.Desktop/Overlays/VersionManager.cs
View File

@ -47,6 +47,10 @@ namespace osu.Desktop.Overlays
private async void updateChecker() private async void updateChecker()
{ {
updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true); updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
if (!updateManager.IsInstalledApp)
return;
var info = await updateManager.CheckForUpdate(); var info = await updateManager.CheckForUpdate();
if (info.ReleasesToApply.Count > 0) if (info.ReleasesToApply.Count > 0)
{ {

4
osu.Desktop/Properties/AssemblyInfo.cs
View File

@ -22,5 +22,5 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("55e28cb2-7b6c-4595-8dcc-9871d8aad7e9")] [assembly: Guid("55e28cb2-7b6c-4595-8dcc-9871d8aad7e9")]
[assembly: AssemblyVersion("0.0.3")] [assembly: AssemblyVersion("0.0.5")]
[assembly: AssemblyFileVersion("0.0.3")] [assembly: AssemblyFileVersion("0.0.5")]

2
osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Direction = FlowDirection.VerticalOnly; Direction = FlowDirections.Vertical;
Spacing = new Vector2(0, 2); Spacing = new Vector2(0, 2);
Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset; Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;

6
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -77,7 +77,7 @@ namespace osu.Game.Beatmaps.Drawables
new FlowContainer new FlowContainer
{ {
Padding = new MarginPadding(5), Padding = new MarginPadding(5),
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
@ -93,13 +93,13 @@ namespace osu.Game.Beatmaps.Drawables
{ {
Padding = new MarginPadding { Left = 5 }, Padding = new MarginPadding { Left = 5 },
Spacing = new Vector2(0, 5), Spacing = new Vector2(0, 5),
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new FlowContainer new FlowContainer
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(4, 0), Spacing = new Vector2(4, 0),
Children = new[] Children = new[]

4
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Beatmaps.Drawables
}, },
new FlowContainer new FlowContainer
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 }, Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new[] Children = new[]
@ -113,7 +113,7 @@ namespace osu.Game.Beatmaps.Drawables
new FlowContainer new FlowContainer
{ {
Depth = -1, Depth = -1,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
// This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
Shear = new Vector2(0.8f, 0), Shear = new Vector2(0.8f, 0),

2
osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
new FlowContainer new FlowContainer
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Children = new Drawable[] Children = new Drawable[]

2
osu.Game/Online/Chat/Drawables/ChannelDisplay.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Online.Chat.Drawables
{ {
flow = new FlowContainer flow = new FlowContainer
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Spacing = new Vector2(1, 1) Spacing = new Vector2(1, 1)

2
osu.Game/Overlays/NotificationManager.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Overlays
{ {
sections = new FlowContainer<NotificationSection> sections = new FlowContainer<NotificationSection>
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Children = new [] Children = new []

2
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Notifications
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Direction = FlowDirection.VerticalOnly; Direction = FlowDirections.Vertical;
Padding = new MarginPadding Padding = new MarginPadding
{ {

2
osu.Game/Overlays/Options/OptionDropDown.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Options
{ {
Items = new KeyValuePair<string, T>[0]; Items = new KeyValuePair<string, T>[0];
Direction = FlowDirection.VerticalOnly; Direction = FlowDirections.Vertical;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Children = new Drawable[] Children = new Drawable[]

2
osu.Game/Overlays/Options/OptionSlider.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Options
public OptionSlider() public OptionSlider()
{ {
Direction = FlowDirection.VerticalOnly; Direction = FlowDirections.Vertical;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Padding = new MarginPadding { Right = 5 }; Padding = new MarginPadding { Right = 5 };

2
osu.Game/Overlays/Options/OptionsSection.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Options
FlowContent = new FlowContainer FlowContent = new FlowContainer
{ {
Margin = new MarginPadding { Top = header_size + header_margin }, Margin = new MarginPadding { Top = header_size + header_margin },
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Spacing = new Vector2(0, 30), Spacing = new Vector2(0, 30),
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,

4
osu.Game/Overlays/Options/OptionsSubsection.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Options
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Direction = FlowDirection.VerticalOnly; Direction = FlowDirections.Vertical;
AddInternal(new Drawable[] AddInternal(new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Options
}, },
content = new FlowContainer content = new FlowContainer
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Spacing = new Vector2(0, 5), Spacing = new Vector2(0, 5),

2
osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
View File

@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Options.Sections.General
private void load(APIAccess api, OsuConfigManager config) private void load(APIAccess api, OsuConfigManager config)
{ {
this.api = api; this.api = api;
Direction = FlowDirection.VerticalOnly; Direction = FlowDirections.Vertical;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Spacing = new Vector2(0, 5); Spacing = new Vector2(0, 5);

2
osu.Game/Overlays/Options/Sidebar.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Options
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirection.VerticalOnly Direction = FlowDirections.Vertical
} }
} }
}, },

6
osu.Game/Overlays/OptionsOverlay.cs
View File

@ -82,7 +82,7 @@ namespace osu.Game.Overlays
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Children = new Drawable[] Children = new Drawable[]
{ {
@ -103,7 +103,7 @@ namespace osu.Game.Overlays
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Children = sections, Children = sections,
} }
} }
@ -141,7 +141,7 @@ namespace osu.Game.Overlays
foreach (OptionsSection section in sections) foreach (OptionsSection section in sections)
{ {
float distance = Math.Abs(scrollContainer.GetChildYInContent(section) - currentScroll); float distance = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll);
if (distance < bestDistance) if (distance < bestDistance)
{ {
bestDistance = distance; bestDistance = distance;

4
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Pause
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Spacing = new Vector2(0f, 50f), Spacing = new Vector2(0f, 50f),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -113,7 +113,7 @@ namespace osu.Game.Overlays.Pause
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Spacing = new Vector2(0f, 20f), Spacing = new Vector2(0f, 20f),
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,

4
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Overlays.Toolbar
new ToolbarBackground(), new ToolbarBackground(),
new FlowContainer new FlowContainer
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]
@ -63,7 +63,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]

4
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Toolbar
}, },
Flow = new FlowContainer Flow = new FlowContainer
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 }, Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 },
@ -107,7 +107,7 @@ namespace osu.Game.Overlays.Toolbar
}, },
tooltipContainer = new FlowContainer tooltipContainer = new FlowContainer
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize
Anchor = (TooltipAnchor & Anchor.x0) > 0 ? Anchor.BottomLeft : Anchor.BottomRight, Anchor = (TooltipAnchor & Anchor.x0) > 0 ? Anchor.BottomLeft : Anchor.BottomRight,
Origin = TooltipAnchor, Origin = TooltipAnchor,

2
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Padding = new MarginPadding { Left = 10, Right = 10 }, Padding = new MarginPadding { Left = 10, Right = 10 },

2
osu.Game/Screens/GameModeWhiteBox.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Screens
}, },
childModeButtons = new FlowContainer childModeButtons = new FlowContainer
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,

2
osu.Game/Screens/Menu/Button.cs
View File

@ -114,7 +114,7 @@ namespace osu.Game.Screens.Menu
new OsuSpriteText new OsuSpriteText
{ {
Shadow = true, Shadow = true,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
TextSize = 16, TextSize = 16,

2
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -81,7 +81,7 @@ namespace osu.Game.Screens.Menu
}, },
buttonFlow = new FlowContainerWithOrigin buttonFlow = new FlowContainerWithOrigin
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(-WEDGE_WIDTH, 0), Spacing = new Vector2(-WEDGE_WIDTH, 0),

2
osu.Game/Screens/Play/KeyCounterCollection.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play
{ {
public KeyCounterCollection() public KeyCounterCollection()
{ {
Direction = FlowDirection.HorizontalOnly; Direction = FlowDirections.Horizontal;
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
} }

2
osu.Game/Screens/Ranking/Results.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Screens.Ranking
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText

4
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -127,7 +127,7 @@ namespace osu.Game.Screens.Select
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 }, Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
@ -149,7 +149,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = 10 },
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new [] Children = new []
{ {

6
osu.Game/Screens/Select/FilterControl.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Width = 0.4f, // TODO: InnerWidth property or something Width = 0.4f, // TODO: InnerWidth property or something
Direction = FlowDirection.VerticalOnly, Direction = FlowDirections.Vertical,
Children = new Drawable[] Children = new Drawable[]
{ {
searchTextBox = new SearchTextBox { RelativeSizeAxes = Axes.X }, searchTextBox = new SearchTextBox { RelativeSizeAxes = Axes.X },
@ -175,7 +175,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
@ -207,7 +207,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,

4
osu.Game/Screens/Select/Footer.cs
View File

@ -94,14 +94,14 @@ namespace osu.Game.Screens.Select
Position = new Vector2(BackButton.SIZE_EXTENDED.X + padding, 0), Position = new Vector2(BackButton.SIZE_EXTENDED.X + padding, 0),
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Spacing = new Vector2(padding, 0), Spacing = new Vector2(padding, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
buttons = new FlowContainer buttons = new FlowContainer
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirections.Horizontal,
Spacing = new Vector2(0.2f, 0), Spacing = new Vector2(0.2f, 0),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
} }