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

Fix FlowContainers.

Browse Source
This commit is contained in:
Dean Herbert
2016-10-22 18:05:46 +09:00
parent cdef75c98b
commit 28a41dcca6
6 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -80,8 +80,9 @@ namespace osu.Game.GameModes.Menu
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirection.HorizontalOnly,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(-wedge_width, 0), Spacing = new Vector2(-wedge_width, 0),
Children = new Drawable[] Children = new[]
{ {
settingsButton = new Button(@"settings", @"options", FontAwesome.gear, new Color4(85, 85, 85, 255), OnSettings, -wedge_width, Key.O), settingsButton = new Button(@"settings", @"options", FontAwesome.gear, new Color4(85, 85, 85, 255), OnSettings, -wedge_width, Key.O),
backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape), backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape),

1
osu.Game/Online/Chat/Display/ChannelDisplay.cs
View File

@ -45,6 +45,7 @@ namespace osu.Game.Online.Chat.Display
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirection.VerticalOnly,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Spacing = new Vector2(1, 1) Spacing = new Vector2(1, 1)
} }
} }

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

@ -57,6 +57,7 @@ namespace osu.Game.Overlays
{ {
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirection.HorizontalOnly,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]
{ {
new ToolbarButton new ToolbarButton
@ -85,6 +86,7 @@ namespace osu.Game.Overlays
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirection.HorizontalOnly,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new [] Children = new []
{ {
new ToolbarButton new ToolbarButton

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

@ -77,6 +77,7 @@ namespace osu.Game.Overlays
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Padding = new MarginPadding { Left = 5, Right = 5 }, Padding = new MarginPadding { Left = 5, Right = 5 },
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]
{ {
DrawableIcon = new TextAwesome DrawableIcon = new TextAwesome
@ -95,6 +96,7 @@ namespace osu.Game.Overlays
tooltipContainer = new FlowContainer tooltipContainer = new FlowContainer
{ {
Direction = FlowDirection.VerticalOnly, Direction = FlowDirection.VerticalOnly,
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Position = new Vector2(5, -5), Position = new Vector2(5, -5),
Alpha = 0, Alpha = 0,

1
osu.Game/Overlays/ToolbarModeSelector.cs
View File

@ -44,6 +44,7 @@ namespace osu.Game.Overlays
modeButtons = new FlowContainer modeButtons = new FlowContainer
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Direction = FlowDirection.HorizontalOnly, Direction = FlowDirection.HorizontalOnly,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

1
osu.Game/VolumeControl.cs
View File

@ -42,6 +42,7 @@ namespace osu.Game
{ {
volumeMetersContainer = new FlowContainer volumeMetersContainer = new FlowContainer
{ {
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
Position = new Vector2(10, 30), Position = new Vector2(10, 30),