1
0
mirror of https://github.com/ppy/osu.git synced 2026-06-05 23:54:24 +08:00

Initial updates to make generic containers work.

This commit is contained in:
Dean Herbert
2016-11-07 21:13:56 +09:00
Unverified
parent dd57f52744
commit a61fb5ef5d
6 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -12,7 +12,7 @@ namespace osu.Game.GameModes.Play.Osu
{
public class OsuPlayfield : Playfield
{
protected override Container Content => hitObjectContainer;
protected override Container<Drawable> Content => hitObjectContainer;
private Container hitObjectContainer;
@@ -53,7 +53,7 @@ namespace osu.Game.GameModes.Play.Osu
class HitObjectContainer : Container
{
protected override Vector2 ChildScale => new Vector2(0.625f);
public override Vector2 ChildScale => new Vector2(0.625f);
}
}
}
@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.Containers
private Container content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
protected override void Load(BaseGame game)
{
+1 -1
View File
@@ -30,7 +30,7 @@ namespace osu.Game
public OptionsOverlay Options;
public APIAccess API;
protected override Container Content => ratioContainer;
protected override Container<Drawable> Content => ratioContainer;
private RatioAdjust ratioContainer;
+1 -1
View File
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
private Container content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
private APIAccess api;
+1 -1
View File
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Options
public abstract class OptionsSection : Container
{
protected FlowContainer content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
protected abstract string Header { get; }
@@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Options
public abstract class OptionsSubsection : Container
{
private Container content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
protected abstract string Header { get; }