sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +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

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

@ -84,19 +84,18 @@ namespace osu.Game.Overlays.Toolbar
},
Flow = new FlowContainer
{
Direction = FlowDirections.Horizontal,
FlowStrategy = FlowStrategies.GetHorizontalFlow(new Vector2(5)),
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 },
Spacing = new Vector2(5),
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new Drawable[]
{
DrawableIcon = new TextAwesome
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
DrawableText = new OsuSpriteText
{
@ -107,7 +106,7 @@ namespace osu.Game.Overlays.Toolbar
},
tooltipContainer = new FlowContainer
{
Direction = FlowDirections.Vertical,
FlowStrategy = FlowStrategies.GetVerticalFlow(),
RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize
Anchor = (TooltipAnchor & Anchor.x0) > 0 ? Anchor.BottomLeft : Anchor.BottomRight,
Origin = TooltipAnchor,