h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-30 05:59:53 +08:00
Code Issues Releases Wiki Activity

Merge pull request #148 from peppy/generic-container

Browse Source 
Generic containers.
This commit is contained in:
Dean Herbert
2016-11-09 11:33:58 +09:00
committed by GitHub
Unverified
parent 53d1798dee 2cbb74a2b8
commit fe843edc4e
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu-framework
+1 -1
Submodule osu-framework updated: 478d0dd295...b8d0a0050b
osu.Game/GameModes/Play/Osu/OsuPlayfield.cs
+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);
}
}
}
osu.Game/Graphics/Containers/ParallaxContainer.cs
+1 -1
View File
@@ -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)
{
osu.Game/OsuGameBase.cs
+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;
osu.Game/Overlays/ChatConsole.cs
+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;
osu.Game/Overlays/Options/OptionsSection.cs
+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;
public abstract FontAwesome Icon { get; }
protected abstract string Header { get; }
osu.Game/Overlays/Options/OptionsSideNav.cs
+1 -1
View File
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Options
public class OptionsSideNav : Container
{
private FlowContainer content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
public OptionsSideNav()
{
osu.Game/Overlays/Options/OptionsSubsection.cs
+2 -2
View File
@@ -7,8 +7,8 @@ namespace osu.Game.Overlays.Options
{
public abstract class OptionsSubsection : Container
{
private Container content;
protected override Container Content => content;
private Container<Drawable> content;
protected override Container<Drawable> Content => content;
protected abstract string Header { get; }