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

Post-merge fixes.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-02 16:54:55 +09:00
parent ff5f0af2d3
commit d1cd077e0d
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 0b11b8b1ed740ab74371cf178b5d956ac7bc1547
Subproject commit 5dbb4a5134dacb2e98ab8f2af219039a72bd32e6

10
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Dialog
private readonly Vector2 buttonsEnterSpacing = new Vector2(0f, 50f);
private Container content, ring;
private FlowContainer<PopupDialogButton> buttonsContainer;
private FillFlowContainer<PopupDialogButton> buttonsContainer;
private TextAwesome iconText;
private SpriteText header, body;
@ -194,14 +194,14 @@ namespace osu.Game.Overlays.Dialog
},
},
},
new FlowContainer
new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Position = new Vector2(0f, -50f),
Direction = FlowDirections.Vertical,
Direction = FillDirection.Down,
Spacing = new Vector2(0f, 10f),
Children = new Drawable[]
{
@ -258,13 +258,13 @@ namespace osu.Game.Overlays.Dialog
},
},
},
buttonsContainer = new FlowContainer<PopupDialogButton>
buttonsContainer = new FillFlowContainer<PopupDialogButton>
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FlowDirections.Vertical,
Direction = FillDirection.Down,
},
},
},