sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update usage of FlowContainer and its subclasses

Browse Source
This commit is contained in:
default0
2017-02-26 21:32:43 +01:00
parent 1b92519a86
commit 8d91519d59
34 changed files with 58 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,16 +60,15 @@ namespace osu.Desktop.Overlays
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
Children = new Drawable[] Children = new Drawable[]
{ {
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(5)),
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Spacing = new Vector2(5),
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
@ -95,6 +94,8 @@ namespace osu.Desktop.Overlays
}, },
new Sprite new Sprite
{ {
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Texture = textures.Get(@"Menu/dev-build-footer"), Texture = textures.Get(@"Menu/dev-build-footer"),
}, },
} }

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

@ -25,8 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Direction = FlowDirections.Vertical; FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 2));
Spacing = new Vector2(0, 2);
Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset; Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
Children = new Drawable[] Children = new Drawable[]

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

@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps.Drawables
new FlowContainer new FlowContainer
{ {
Padding = new MarginPadding(5), Padding = new MarginPadding(5),
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
@ -101,15 +101,14 @@ namespace osu.Game.Beatmaps.Drawables
new FlowContainer new FlowContainer
{ {
Padding = new MarginPadding { Left = 5 }, Padding = new MarginPadding { Left = 5 },
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new FlowContainer new FlowContainer
{ {
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(4, 0)),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(4, 0),
Children = new[] Children = new[]
{ {
new OsuSpriteText new OsuSpriteText

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

@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawables
}, },
new FlowContainer new FlowContainer
{ {
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
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[]
@ -112,7 +112,7 @@ namespace osu.Game.Beatmaps.Drawables
new FlowContainer new FlowContainer
{ {
Depth = -1, Depth = -1,
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
// This makes the gradient not be perfectly horizontal, but diagonal at a ~40<34> angle // This makes the gradient not be perfectly horizontal, but diagonal at a ~40<34> angle
Shear = new Vector2(0.8f, 0), Shear = new Vector2(0.8f, 0),

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

@ -21,7 +21,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
new FlowContainer new FlowContainer
{ {
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Children = new Drawable[] Children = new Drawable[]

3
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -73,8 +73,7 @@ namespace osu.Game.Graphics.UserInterface
stars = new FlowContainer<Star> stars = new FlowContainer<Star>
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(star_spacing)),
Spacing = new Vector2(star_spacing),
} }
}; };

2
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
Margin = new MarginPadding { Left = 10, Right = 10, Top = 30, Bottom = 30 }, Margin = new MarginPadding { Left = 10, Right = 10, Top = 30, Bottom = 30 },
Spacing = new Vector2(15, 0), FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(15, 0)),
Children = new Drawable[] Children = new Drawable[]
{ {
volumeMeterMaster = new VolumeMeter("Master"), volumeMeterMaster = new VolumeMeter("Master"),

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

@ -41,7 +41,7 @@ namespace osu.Game.Online.Chat.Drawables
{ {
flow = new FlowContainer flow = new FlowContainer
{ {
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Left = 20, Right = 20 } Padding = new MarginPadding { Left = 20, Right = 20 }

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

@ -46,7 +46,7 @@ namespace osu.Game.Overlays
{ {
sections = new FlowContainer<NotificationSection> sections = new FlowContainer<NotificationSection>
{ {
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Children = new [] Children = new []

6
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 = FlowDirections.Vertical; FlowStrategy = FlowStrategies.GetVerticalFlow();
Padding = new MarginPadding Padding = new MarginPadding
{ {
@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Notifications
{ {
Bottom = 5 Bottom = 5
}, },
Spacing = new Vector2(5, 0), FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(5, 0)),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Notifications
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
LayoutDuration = 150, LayoutDuration = 150,
LayoutEasing = EasingTypes.OutQuart, LayoutEasing = EasingTypes.OutQuart,
Spacing = new Vector2(3), FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(3)),
} }
}); });
} }

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

@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Options
{ {
Items = new KeyValuePair<string, T>[0]; Items = new KeyValuePair<string, T>[0];
Direction = FlowDirections.Vertical; FlowStrategy = FlowStrategies.GetVerticalFlow();
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

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

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

@ -61,8 +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 = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 30)),
Spacing = new Vector2(0, 30),
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
}, },

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

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Direction = FlowDirections.Vertical; FlowStrategy = FlowStrategies.GetVerticalFlow();
AddInternal(new Drawable[] AddInternal(new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
@ -31,10 +31,9 @@ namespace osu.Game.Overlays.Options
}, },
content = new FlowContainer content = new FlowContainer
{ {
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 5)),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Spacing = new Vector2(0, 5),
}, },
}); });
} }

3
osu.Game/Overlays/Options/Sections/EditorSection.cs
View File

@ -7,6 +7,7 @@ using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK; using OpenTK;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Overlays.Options.Sections namespace osu.Game.Overlays.Options.Sections
{ {
@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Options.Sections
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
FlowContent.Spacing = new Vector2(0, 5); FlowContent.FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(0, 5));
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuCheckbox new OsuCheckbox

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

@ -100,10 +100,9 @@ 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 = FlowDirections.Vertical; FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 5));
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Spacing = new Vector2(0, 5);
Children = new Drawable[] Children = new Drawable[]
{ {
username = new OsuTextBox username = new OsuTextBox

3
osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Graphics;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK; using OpenTK;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Overlays.Options.Sections namespace osu.Game.Overlays.Options.Sections
{ {
@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Options.Sections
public MaintenanceSection() public MaintenanceSection()
{ {
FlowContent.Spacing = new Vector2(0, 5); FlowContent.FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(0, 5));
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuButton new OsuButton

3
osu.Game/Overlays/Options/Sections/SkinSection.cs
View File

@ -8,6 +8,7 @@ using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK; using OpenTK;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Overlays.Options.Sections namespace osu.Game.Overlays.Options.Sections
{ {
@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Options.Sections
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
FlowContent.Spacing = new Vector2(0, 5); FlowContent.FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(0, 5));
Children = new Drawable[] Children = new Drawable[]
{ {
new OptionLabel { Text = "TODO: Skin preview textures" }, new OptionLabel { Text = "TODO: Skin preview textures" },

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

@ -40,7 +40,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 = FlowDirections.Vertical FlowStrategy = FlowStrategies.GetVerticalFlow(),
} }
} }
}, },

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

@ -77,7 +77,7 @@ namespace osu.Game.Overlays
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
Children = new Drawable[] Children = new Drawable[]
{ {
@ -98,7 +98,7 @@ namespace osu.Game.Overlays
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
Children = sections, Children = sections,
} }
} }

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

@ -104,8 +104,7 @@ namespace osu.Game.Overlays.Pause
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 50)),
Spacing = new Vector2(0f, 50f),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Children = new Drawable[] Children = new Drawable[]
@ -113,8 +112,7 @@ namespace osu.Game.Overlays.Pause
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 20)),
Spacing = new Vector2(0f, 20f),
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Children = new Drawable[] Children = new Drawable[]

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 = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
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 = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]

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

@ -84,19 +84,18 @@ namespace osu.Game.Overlays.Toolbar
}, },
Flow = new FlowContainer Flow = new FlowContainer
{ {
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(5)),
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 },
Spacing = new Vector2(5),
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]
{ {
DrawableIcon = new TextAwesome DrawableIcon = new TextAwesome
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.Centre,
Origin = Anchor.CentreLeft, Origin = Anchor.Centre,
}, },
DrawableText = new OsuSpriteText DrawableText = new OsuSpriteText
{ {
@ -107,7 +106,7 @@ namespace osu.Game.Overlays.Toolbar
}, },
tooltipContainer = new FlowContainer tooltipContainer = new FlowContainer
{ {
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
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

@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Padding = new MarginPadding { Left = padding, Right = padding }, Padding = new MarginPadding { Left = padding, Right = padding },

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

@ -126,7 +126,7 @@ namespace osu.Game.Screens
}, },
childModeButtons = new FlowContainer childModeButtons = new FlowContainer
{ {
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
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 = FlowDirections.Horizontal, AllowMultiline = false,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
TextSize = 16, TextSize = 16,

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

@ -78,16 +78,15 @@ namespace osu.Game.Screens.Menu
}, },
buttonFlow = new FlowContainerWithOrigin buttonFlow = new FlowContainerWithOrigin
{ {
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(-WEDGE_WIDTH, 0)),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(-WEDGE_WIDTH, 0),
Children = new[] Children = new[]
{ {
settingsButton = new Button(@"settings", @"options", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O), settingsButton = new Button(@"settings", @"options", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH), backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
iconFacade = new Container //need a container to make the osu! icon flow properly. iconFacade = new Container //need a container to make the osu! icon flow properly.
{ {
Size = new Vector2(0, BUTTON_AREA_HEIGHT) Size = new Vector2(0, BUTTON_AREA_HEIGHT)
} }
}, },

3
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -32,8 +32,7 @@ namespace osu.Game.Screens.Menu
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(new Vector2(0, 2)),
Spacing = new Vector2(0, 2),
Children = new Drawable[] Children = new Drawable[]
{ {
icon = new TextAwesome icon = new TextAwesome

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

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

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

@ -139,7 +139,7 @@ namespace osu.Game.Screens.Play
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText

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

@ -68,7 +68,7 @@ namespace osu.Game.Screens.Ranking
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText

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

@ -125,7 +125,7 @@ namespace osu.Game.Screens.Select
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Direction = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
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[]
@ -147,7 +147,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = 10 },
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new [] Children = new []
{ {
@ -170,7 +170,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
Margin = new MarginPadding { Top = 20 }, Margin = new MarginPadding { Top = 20 },
Spacing = new Vector2(40,0), FlowStrategy = FlowStrategies.GetFillFlow(new Vector2(40, 0)),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = labels Children = labels
}, },

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

@ -44,7 +44,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 = FlowDirections.Vertical, FlowStrategy = FlowStrategies.GetVerticalFlow(),
Children = new Drawable[] Children = new Drawable[]
{ {
searchTextBox = new SearchTextBox { searchTextBox = new SearchTextBox {
@ -177,8 +177,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(10, 0)),
Spacing = new Vector2(10, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
new TabItem new TabItem
@ -209,8 +208,7 @@ namespace osu.Game.Screens.Select
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(10, 0)),
Spacing = new Vector2(10, 0),
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Children = new Drawable[] Children = new Drawable[]

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

@ -98,15 +98,13 @@ 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 = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(padding, 0)),
Spacing = new Vector2(padding, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
buttons = new FlowContainer buttons = new FlowContainer
{ {
Direction = FlowDirections.Horizontal, FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(0.2f, 0)),
Spacing = new Vector2(0.2f, 0),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
} }
} }