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

Update framewörk

Browse Source
This commit is contained in:
Thomas Müller
2017-03-01 19:33:01 +01:00
parent d46e68b36b
commit 9c853b0465
37 changed files with 127 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,11 +121,11 @@ namespace osu.Game.Screens.Select
},
},
// Text for beatmap info
new FlowContainer
new FillFlowContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
FlowStrategy = FlowStrategies.CreateVerticalFlow(),
Direction = FlowDirection.Down,
Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
@ -144,10 +144,10 @@ namespace osu.Game.Screens.Select
TextSize = 17,
Shadow = true,
},
new FlowContainer
new FillFlowContainer
{
Margin = new MarginPadding { Top = 10 },
FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
Direction = FlowDirection.Right,
AutoSizeAxes = Axes.Both,
Children = new []
{
@ -167,10 +167,10 @@ namespace osu.Game.Screens.Select
},
}
},
new FlowContainer
new FillFlowContainer
{
Margin = new MarginPadding { Top = 20 },
FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(40, 0)),
Spacing = new Vector2(40, 0),
AutoSizeAxes = Axes.Both,
Children = labels
},

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

@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select
Alpha = 0.8f,
RelativeSizeAxes = Axes.Both,
},
new FlowContainer
new FillFlowContainer
{
Padding = new MarginPadding(20),
AutoSizeAxes = Axes.Y,
@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Width = 0.4f, // TODO: InnerWidth property or something
FlowStrategy = FlowStrategies.CreateVerticalFlow(),
Direction = FlowDirection.Down,
Children = new Drawable[]
{
searchTextBox = new SearchTextBox {
@ -174,10 +174,11 @@ namespace osu.Game.Screens.Select
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
},
new FlowContainer
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(10, 0)),
Direction = FlowDirection.Right,
Spacing = new Vector2(10, 0),
Children = new Drawable[]
{
new TabItem
@ -205,10 +206,11 @@ namespace osu.Game.Screens.Select
}
}
},
new FlowContainer
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(10, 0)),
Direction = FlowDirection.Right,
Spacing = new Vector2(10, 0),
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
Children = new Drawable[]

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

@ -30,7 +30,7 @@ namespace osu.Game.Screens.Select
public Action OnBack;
public Action OnStart;
private FlowContainer buttons;
private FillFlowContainer buttons;
public OsuLogo StartButton;
@ -91,20 +91,21 @@ namespace osu.Game.Screens.Select
Origin = Anchor.BottomLeft,
Action = () => OnBack?.Invoke(),
},
new FlowContainer
new FillFlowContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Position = new Vector2(BackButton.SIZE_EXTENDED.X + padding, 0),
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(padding, 0)),
Direction = FlowDirection.Right,
Spacing = new Vector2(padding, 0),
Children = new Drawable[]
{
buttons = new FlowContainer
buttons = new FillFlowContainer
{
FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(0.2f, 0)),
Direction = FlowDirection.Right,
Spacing = new Vector2(0.2f, 0),
AutoSizeAxes = Axes.Both,
}
}