mirror of https://github.com/ppy/osu
Initial updates to make generic containers work.
This commit is contained in:
parent
dd57f52744
commit
a61fb5ef5d
|
@ -12,7 +12,7 @@ namespace osu.Game.GameModes.Play.Osu
|
||||||
{
|
{
|
||||||
public class OsuPlayfield : Playfield
|
public class OsuPlayfield : Playfield
|
||||||
{
|
{
|
||||||
protected override Container Content => hitObjectContainer;
|
protected override Container<Drawable> Content => hitObjectContainer;
|
||||||
|
|
||||||
private Container hitObjectContainer;
|
private Container hitObjectContainer;
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ public OsuPlayfield()
|
||||||
|
|
||||||
class HitObjectContainer : Container
|
class HitObjectContainer : Container
|
||||||
{
|
{
|
||||||
protected override Vector2 ChildScale => new Vector2(0.625f);
|
public override Vector2 ChildScale => new Vector2(0.625f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -25,7 +25,7 @@ public ParallaxContainer()
|
||||||
|
|
||||||
private Container content;
|
private Container content;
|
||||||
|
|
||||||
protected override Container Content => content;
|
protected override Container<Drawable> Content => content;
|
||||||
|
|
||||||
protected override void Load(BaseGame game)
|
protected override void Load(BaseGame game)
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,7 +30,7 @@ public class OsuGameBase : BaseGame
|
||||||
public OptionsOverlay Options;
|
public OptionsOverlay Options;
|
||||||
public APIAccess API;
|
public APIAccess API;
|
||||||
|
|
||||||
protected override Container Content => ratioContainer;
|
protected override Container<Drawable> Content => ratioContainer;
|
||||||
|
|
||||||
private RatioAdjust ratioContainer;
|
private RatioAdjust ratioContainer;
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class ChatConsole : OverlayContainer
|
||||||
|
|
||||||
private Container content;
|
private Container content;
|
||||||
|
|
||||||
protected override Container Content => content;
|
protected override Container<Drawable> Content => content;
|
||||||
|
|
||||||
private APIAccess api;
|
private APIAccess api;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Options
|
||||||
public abstract class OptionsSection : Container
|
public abstract class OptionsSection : Container
|
||||||
{
|
{
|
||||||
protected FlowContainer content;
|
protected FlowContainer content;
|
||||||
protected override Container Content => content;
|
protected override Container<Drawable> Content => content;
|
||||||
|
|
||||||
protected abstract string Header { get; }
|
protected abstract string Header { get; }
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Options
|
||||||
public abstract class OptionsSubsection : Container
|
public abstract class OptionsSubsection : Container
|
||||||
{
|
{
|
||||||
private Container content;
|
private Container content;
|
||||||
protected override Container Content => content;
|
protected override Container<Drawable> Content => content;
|
||||||
|
|
||||||
protected abstract string Header { get; }
|
protected abstract string Header { get; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue