Skip to content

Commit 34b3fda

Browse files
EVAST9919EVAST9919
committed
Update GridContainer usage with direct padding application
1 parent 1bd0fc3 commit 34b3fda

File tree

4 files changed

+123
-139
lines changed

4 files changed

+123
-139
lines changed

‎osu.Framework.Tests/Visual/Sprites/TestSceneAnimationLayout.cs

+25-29
Original file line numberDiff line numberDiff line change
@@ -39,47 +39,43 @@ public TestSceneAnimationLayout()
3939
Cell(1, 2).Child = createTest("drawable - fixed size", () => new TestDrawableAnimation(Axes.Both) { Size = new Vector2(100, 50) });
4040
}
4141

42-
private Drawable createTest(string name, Func<Drawable> animationCreationFunc) => new Container
42+
private Drawable createTest(string name, Func<Drawable> animationCreationFunc) => new GridContainer
4343
{
4444
RelativeSizeAxes = Axes.Both,
4545
Padding = new MarginPadding(10),
46-
Child = new GridContainer
46+
Content = new[]
4747
{
48-
RelativeSizeAxes = Axes.Both,
49-
Content = new[]
48+
new Drawable[]
5049
{
51-
new Drawable[]
50+
new SpriteText
5251
{
53-
new SpriteText
54-
{
55-
Anchor = Anchor.TopCentre,
56-
Origin = Anchor.TopCentre,
57-
Text = name
58-
},
52+
Anchor = Anchor.TopCentre,
53+
Origin = Anchor.TopCentre,
54+
Text = name
5955
},
60-
new Drawable[]
56+
},
57+
new Drawable[]
58+
{
59+
new Container
6160
{
62-
new Container
61+
RelativeSizeAxes = Axes.Both,
62+
Masking = true,
63+
BorderColour = Color4.OrangeRed,
64+
BorderThickness = 2,
65+
Children = new[]
6366
{
64-
RelativeSizeAxes = Axes.Both,
65-
Masking = true,
66-
BorderColour = Color4.OrangeRed,
67-
BorderThickness = 2,
68-
Children = new[]
67+
new Box
6968
{
70-
new Box
71-
{
72-
RelativeSizeAxes = Axes.Both,
73-
Alpha = 0,
74-
AlwaysPresent = true
75-
},
76-
animationCreationFunc()
77-
}
69+
RelativeSizeAxes = Axes.Both,
70+
Alpha = 0,
71+
AlwaysPresent = true
72+
},
73+
animationCreationFunc()
7874
}
79-
},
75+
}
8076
},
81-
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
82-
}
77+
},
78+
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
8379
};
8480

8581
private partial class TestDrawableAnimation : DrawableAnimation

‎osu.Framework.Tests/Visual/Sprites/TestSceneLargeTextureStore.cs

+18-22
Original file line numberDiff line numberDiff line change
@@ -64,35 +64,31 @@ private void load(IRenderer renderer, GameHost host, Game game)
6464
Origin = Anchor.TopCentre,
6565
Text = $"useManaulMipmaps: {useManualMipmaps}"
6666
},
67-
new Container
67+
new GridContainer
6868
{
6969
RelativeSizeAxes = Axes.Both,
7070
Padding = new MarginPadding { Top = 20 },
71-
Child = new GridContainer
71+
ColumnDimensions = new[]
7272
{
73-
RelativeSizeAxes = Axes.Both,
74-
ColumnDimensions = new[]
75-
{
76-
new Dimension(GridSizeMode.Relative, 0.5f),
77-
new Dimension(GridSizeMode.Relative, 0.5f),
78-
},
79-
RowDimensions = new[]
73+
new Dimension(GridSizeMode.Relative, 0.5f),
74+
new Dimension(GridSizeMode.Relative, 0.5f),
75+
},
76+
RowDimensions = new[]
77+
{
78+
new Dimension(GridSizeMode.Relative, 0.5f),
79+
new Dimension(GridSizeMode.Relative, 0.5f),
80+
},
81+
Content = new[]
82+
{
83+
new Drawable[]
8084
{
81-
new Dimension(GridSizeMode.Relative, 0.5f),
82-
new Dimension(GridSizeMode.Relative, 0.5f),
85+
new MipmapSprite(0),
86+
new MipmapSprite(1)
8387
},
84-
Content = new[]
88+
new Drawable[]
8589
{
86-
new Drawable[]
87-
{
88-
new MipmapSprite(0),
89-
new MipmapSprite(1)
90-
},
91-
new Drawable[]
92-
{
93-
new MipmapSprite(2),
94-
new MipmapSprite(3)
95-
}
90+
new MipmapSprite(2),
91+
new MipmapSprite(3)
9692
}
9793
}
9894
}

‎osu.Framework.Tests/Visual/Sprites/TestSceneVideoLayout.cs

+25-29
Original file line numberDiff line numberDiff line change
@@ -41,47 +41,43 @@ private void load(Game game)
4141
});
4242
}
4343

44-
private Drawable createTest(string name, Func<Drawable> animationCreationFunc) => new Container
44+
private Drawable createTest(string name, Func<Drawable> animationCreationFunc) => new GridContainer
4545
{
4646
RelativeSizeAxes = Axes.Both,
4747
Padding = new MarginPadding(10),
48-
Child = new GridContainer
48+
Content = new[]
4949
{
50-
RelativeSizeAxes = Axes.Both,
51-
Content = new[]
50+
new Drawable[]
5251
{
53-
new Drawable[]
52+
new SpriteText
5453
{
55-
new SpriteText
56-
{
57-
Anchor = Anchor.TopCentre,
58-
Origin = Anchor.TopCentre,
59-
Text = name
60-
},
54+
Anchor = Anchor.TopCentre,
55+
Origin = Anchor.TopCentre,
56+
Text = name
6157
},
62-
new Drawable[]
58+
},
59+
new Drawable[]
60+
{
61+
new Container
6362
{
64-
new Container
63+
RelativeSizeAxes = Axes.Both,
64+
Masking = true,
65+
BorderColour = Color4.OrangeRed,
66+
BorderThickness = 2,
67+
Children = new[]
6568
{
66-
RelativeSizeAxes = Axes.Both,
67-
Masking = true,
68-
BorderColour = Color4.OrangeRed,
69-
BorderThickness = 2,
70-
Children = new[]
69+
new Box
7170
{
72-
new Box
73-
{
74-
RelativeSizeAxes = Axes.Both,
75-
Alpha = 0,
76-
AlwaysPresent = true
77-
},
78-
animationCreationFunc()
79-
}
71+
RelativeSizeAxes = Axes.Both,
72+
Alpha = 0,
73+
AlwaysPresent = true
74+
},
75+
animationCreationFunc()
8076
}
81-
},
77+
}
8278
},
83-
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
84-
}
79+
},
80+
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
8581
};
8682
}
8783
}

‎osu.Framework/Testing/Drawables/TestBrowserToolbar.cs

+55-59
Original file line numberDiff line numberDiff line change
@@ -33,82 +33,78 @@ private void load(TestBrowser browser)
3333
Colour = FrameworkColour.GreenDark,
3434
},
3535
},
36-
new Container
36+
new GridContainer
3737
{
38-
Padding = new MarginPadding(section_padding),
3938
RelativeSizeAxes = Axes.Both,
40-
Child = new GridContainer
39+
Padding = new MarginPadding(section_padding),
40+
ColumnDimensions = new[]
4141
{
42-
RelativeSizeAxes = Axes.Both,
43-
ColumnDimensions = new[]
44-
{
45-
new Dimension(GridSizeMode.AutoSize),
46-
new Dimension(),
47-
new Dimension(GridSizeMode.AutoSize),
48-
new Dimension(GridSizeMode.AutoSize),
49-
},
50-
Content = new[]
42+
new Dimension(GridSizeMode.AutoSize),
43+
new Dimension(),
44+
new Dimension(GridSizeMode.AutoSize),
45+
new Dimension(GridSizeMode.AutoSize),
46+
},
47+
Content = new[]
48+
{
49+
new Drawable[]
5150
{
52-
new Drawable[]
51+
new ToolbarRunAllStepsSection { RelativeSizeAxes = Axes.Y },
52+
new ToolbarRateSection { RelativeSizeAxes = Axes.Both },
53+
new Container
5354
{
54-
new ToolbarRunAllStepsSection { RelativeSizeAxes = Axes.Y },
55-
new ToolbarRateSection { RelativeSizeAxes = Axes.Both },
56-
new Container
55+
RelativeSizeAxes = Axes.Y,
56+
AutoSizeAxes = Axes.X,
57+
Margin = new MarginPadding { Horizontal = section_padding },
58+
Children = new Drawable[]
5759
{
58-
RelativeSizeAxes = Axes.Y,
59-
AutoSizeAxes = Axes.X,
60-
Margin = new MarginPadding { Horizontal = section_padding },
61-
Children = new Drawable[]
60+
new Container //Backdrop of the record section
6261
{
63-
new Container //Backdrop of the record section
62+
RelativeSizeAxes = Axes.Both,
63+
Padding = new MarginPadding(-section_padding),
64+
Child = new Box
6465
{
6566
RelativeSizeAxes = Axes.Both,
66-
Padding = new MarginPadding(-section_padding),
67-
Child = new Box
68-
{
69-
RelativeSizeAxes = Axes.Both,
70-
Colour = FrameworkColour.GreenDarker,
71-
},
67+
Colour = FrameworkColour.GreenDarker,
7268
},
73-
new ToolbarRecordSection { RelativeSizeAxes = Axes.Y },
74-
}
75-
},
76-
new Container
69+
},
70+
new ToolbarRecordSection { RelativeSizeAxes = Axes.Y },
71+
}
72+
},
73+
new Container
74+
{
75+
RelativeSizeAxes = Axes.Y,
76+
AutoSizeAxes = Axes.X,
77+
Margin = new MarginPadding { Left = section_padding },
78+
Children = new Drawable[]
7779
{
78-
RelativeSizeAxes = Axes.Y,
79-
AutoSizeAxes = Axes.X,
80-
Margin = new MarginPadding { Left = section_padding },
81-
Children = new Drawable[]
80+
new Container //Backdrop of the bg section
8281
{
83-
new Container //Backdrop of the bg section
82+
RelativeSizeAxes = Axes.Both,
83+
Padding = new MarginPadding(-section_padding),
84+
Child = new Box
8485
{
8586
RelativeSizeAxes = Axes.Both,
86-
Padding = new MarginPadding(-section_padding),
87-
Child = new Box
88-
{
89-
RelativeSizeAxes = Axes.Both,
90-
Colour = FrameworkColour.GreenDarker.Darken(0.5f),
91-
},
87+
Colour = FrameworkColour.GreenDarker.Darken(0.5f),
9288
},
93-
new BasicButton
94-
{
95-
Text = "bg",
96-
RelativeSizeAxes = Axes.Y,
97-
Width = 40,
98-
Action = () => browser.CurrentTest.ChangeBackgroundColour(
99-
new ColourInfo
100-
{
101-
TopLeft = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1),
102-
TopRight = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1),
103-
BottomLeft = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1),
104-
BottomRight = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1)
105-
}
106-
)
107-
},
108-
}
89+
},
90+
new BasicButton
91+
{
92+
Text = "bg",
93+
RelativeSizeAxes = Axes.Y,
94+
Width = 40,
95+
Action = () => browser.CurrentTest.ChangeBackgroundColour(
96+
new ColourInfo
97+
{
98+
TopLeft = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1),
99+
TopRight = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1),
100+
BottomLeft = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1),
101+
BottomRight = new Color4(RNG.NextSingle(1), RNG.NextSingle(1), RNG.NextSingle(1), 1)
102+
}
103+
)
104+
},
109105
}
110106
}
111-
},
107+
}
112108
},
113109
}
114110
};

0 commit comments

Comments
 (0)