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

FlowDirection -> FillDirection

Browse Source
This commit is contained in:
Thomas Müller 2017-03-01 20:15:38 +01:00
parent 9c853b0465
commit 4d28696479
29 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit f3aea04b0e6a6ebb6d6f24fcb2134058765c0df0 Subproject commit 344593a63b2def4d1b9de5940e463a6ea9771b34

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

@ -60,13 +60,13 @@ namespace osu.Desktop.Overlays
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Down, Direction = FillDirection.Down,
Children = new Drawable[] Children = new Drawable[]
{ {
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(5), Spacing = new Vector2(5),
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

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

@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Direction = FlowDirection.Down; Direction = FillDirection.Down;
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

@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps.Drawables
new FillFlowContainer new FillFlowContainer
{ {
Padding = new MarginPadding(5), Padding = new MarginPadding(5),
Direction = FlowDirection.Right, Direction = FillDirection.Right,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
@ -101,13 +101,13 @@ namespace osu.Game.Beatmaps.Drawables
new FillFlowContainer new FillFlowContainer
{ {
Padding = new MarginPadding { Left = 5 }, Padding = new MarginPadding { Left = 5 },
Direction = FlowDirection.Down, Direction = FillDirection.Down,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new FillFlowContainer new FillFlowContainer
{ {
Direction = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(4, 0), Spacing = new Vector2(4, 0),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new[] Children = new[]

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

@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawables
}, },
new FillFlowContainer new FillFlowContainer
{ {
Direction = FlowDirection.Down, Direction = FillDirection.Down,
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 FillFlowContainer new FillFlowContainer
{ {
Depth = -1, Depth = -1,
Direction = FlowDirection.Right, Direction = FillDirection.Right,
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

@ -21,7 +21,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
new FillFlowContainer new FillFlowContainer
{ {
Direction = FlowDirection.Right, Direction = FillDirection.Right,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Children = new Drawable[] Children = new Drawable[]

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

@ -71,7 +71,7 @@ namespace osu.Game.Graphics.UserInterface
stars = new FillFlowContainer<Star> stars = new FillFlowContainer<Star>
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(star_spacing), Spacing = new Vector2(star_spacing),
} }
}; };

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

@ -41,7 +41,7 @@ namespace osu.Game.Online.Chat.Drawables
{ {
flow = new FillFlowContainer flow = new FillFlowContainer
{ {
Direction = FlowDirection.Down, Direction = FillDirection.Down,
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 FillFlowContainer<NotificationSection> sections = new FillFlowContainer<NotificationSection>
{ {
Direction = FlowDirection.Down, Direction = FillDirection.Down,
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.Down; Direction = FillDirection.Down;
Padding = new MarginPadding Padding = new MarginPadding
{ {

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 = FlowDirection.Down; Direction = FillDirection.Down;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Children = new Drawable[] Children = new Drawable[]

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

@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Options
FlowContent = new FillFlowContainer FlowContent = new FillFlowContainer
{ {
Margin = new MarginPadding { Top = header_size + header_margin }, Margin = new MarginPadding { Top = header_size + header_margin },
Direction = FlowDirection.Down, Direction = FillDirection.Down,
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

@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Direction = FlowDirection.Down; Direction = FillDirection.Down;
AddInternal(new Drawable[] AddInternal(new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Options
}, },
content = new FillFlowContainer content = new FillFlowContainer
{ {
Direction = FlowDirection.Down, Direction = FillDirection.Down,
Spacing = new Vector2(0, 5), Spacing = new Vector2(0, 5),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,

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

@ -100,7 +100,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.Down; Direction = FillDirection.Down;
Spacing = new Vector2(0, 5); Spacing = new Vector2(0, 5);
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;

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 = FlowDirection.Down, Direction = FillDirection.Down,
} }
} }
}, },

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 = FlowDirection.Down, Direction = FillDirection.Down,
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 = FlowDirection.Down, Direction = FillDirection.Down,
Children = sections, Children = sections,
} }
} }

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.Down, Direction = FillDirection.Down,
Spacing = new Vector2(0, 50), Spacing = new Vector2(0, 50),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -113,7 +113,7 @@ namespace osu.Game.Overlays.Pause
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Down, Direction = FillDirection.Down,
Spacing = new Vector2(0, 20), Spacing = new Vector2(0, 20),
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 FillFlowContainer new FillFlowContainer
{ {
Direction = FlowDirection.Right, Direction = FillDirection.Right,
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.Right, Direction = FillDirection.Right,
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 FillFlowContainer Flow = new FillFlowContainer
{ {
Direction = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(5), Spacing = new Vector2(5),
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -107,7 +107,7 @@ namespace osu.Game.Overlays.Toolbar
}, },
tooltipContainer = new FillFlowContainer tooltipContainer = new FillFlowContainer
{ {
Direction = FlowDirection.Down, Direction = FillDirection.Down,
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 = FlowDirection.Right, Direction = FillDirection.Right,
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 FillFlowContainer childModeButtons = new FillFlowContainer
{ {
Direction = FlowDirection.Down, Direction = FillDirection.Down,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,

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

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

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

@ -32,7 +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 = FlowDirection.Down, Direction = FillDirection.Down,
Spacing = new Vector2(0, 2), Spacing = new Vector2(0, 2),
Children = new Drawable[] Children = new Drawable[]
{ {

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

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

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

@ -136,7 +136,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 = FlowDirection.Down, Direction = FillDirection.Down,
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 FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Down, Direction = FillDirection.Down,
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText

4
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 = FlowDirection.Down, Direction = FillDirection.Down,
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 FillFlowContainer new FillFlowContainer
{ {
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = 10 },
Direction = FlowDirection.Right, Direction = FillDirection.Right,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new [] Children = new []
{ {

6
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 = FlowDirection.Down, Direction = FillDirection.Down,
Children = new Drawable[] Children = new Drawable[]
{ {
searchTextBox = new SearchTextBox { searchTextBox = new SearchTextBox {
@ -177,7 +177,7 @@ namespace osu.Game.Screens.Select
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
@ -209,7 +209,7 @@ namespace osu.Game.Screens.Select
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FlowDirection.Right, Direction = FillDirection.Right,
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

@ -98,13 +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 = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(padding, 0), Spacing = new Vector2(padding, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
buttons = new FillFlowContainer buttons = new FillFlowContainer
{ {
Direction = FlowDirection.Right, Direction = FillDirection.Right,
Spacing = new Vector2(0.2f, 0), Spacing = new Vector2(0.2f, 0),
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
} }