From a61fb5ef5d49f2ad3566a57fa9bab5a702a75f20 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 7 Nov 2016 21:13:56 +0900 Subject: [PATCH 1/4] Initial updates to make generic containers work. --- osu.Game/GameModes/Play/Osu/OsuPlayfield.cs | 4 ++-- osu.Game/Graphics/Containers/ParallaxContainer.cs | 2 +- osu.Game/OsuGameBase.cs | 2 +- osu.Game/Overlays/ChatConsole.cs | 2 +- osu.Game/Overlays/Options/OptionsSection.cs | 2 +- osu.Game/Overlays/Options/OptionsSubsection.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs b/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs index a6c4112321..09a7666246 100644 --- a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs +++ b/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs @@ -12,7 +12,7 @@ namespace osu.Game.GameModes.Play.Osu { public class OsuPlayfield : Playfield { - protected override Container Content => hitObjectContainer; + protected override Container 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); } } } \ No newline at end of file diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs index 3b385af893..5b28779e47 100644 --- a/osu.Game/Graphics/Containers/ParallaxContainer.cs +++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs @@ -25,7 +25,7 @@ namespace osu.Game.Graphics.Containers private Container content; - protected override Container Content => content; + protected override Container Content => content; protected override void Load(BaseGame game) { diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index ae13b20f4a..6dd42c8a8e 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -30,7 +30,7 @@ namespace osu.Game public OptionsOverlay Options; public APIAccess API; - protected override Container Content => ratioContainer; + protected override Container Content => ratioContainer; private RatioAdjust ratioContainer; diff --git a/osu.Game/Overlays/ChatConsole.cs b/osu.Game/Overlays/ChatConsole.cs index c5aec21364..2dd6480715 100644 --- a/osu.Game/Overlays/ChatConsole.cs +++ b/osu.Game/Overlays/ChatConsole.cs @@ -27,7 +27,7 @@ namespace osu.Game.Overlays private Container content; - protected override Container Content => content; + protected override Container Content => content; private APIAccess api; diff --git a/osu.Game/Overlays/Options/OptionsSection.cs b/osu.Game/Overlays/Options/OptionsSection.cs index 79776cc800..56b6148d2a 100644 --- a/osu.Game/Overlays/Options/OptionsSection.cs +++ b/osu.Game/Overlays/Options/OptionsSection.cs @@ -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 Content => content; protected abstract string Header { get; } diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs index ed3a6a0ca7..5d388bd003 100644 --- a/osu.Game/Overlays/Options/OptionsSubsection.cs +++ b/osu.Game/Overlays/Options/OptionsSubsection.cs @@ -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 Content => content; protected abstract string Header { get; } From d57d5daac98cac724d59c4a4178402e2a122f80d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 7 Nov 2016 21:17:29 +0900 Subject: [PATCH 2/4] Support generic FlowContainer. --- osu.Game/Overlays/Options/OptionsSubsection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs index 5d388bd003..c867b8b7cf 100644 --- a/osu.Game/Overlays/Options/OptionsSubsection.cs +++ b/osu.Game/Overlays/Options/OptionsSubsection.cs @@ -8,7 +8,7 @@ namespace osu.Game.Overlays.Options { public abstract class OptionsSubsection : Container { - private Container content; + private Container content; protected override Container Content => content; protected abstract string Header { get; } From a851d7b44f976824b3287258b827cf68105b62fa Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 8 Nov 2016 18:33:31 +0900 Subject: [PATCH 3/4] Updates. --- osu.Game/Overlays/Options/OptionsSideNav.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Options/OptionsSideNav.cs b/osu.Game/Overlays/Options/OptionsSideNav.cs index c578d138a6..8a38b9b45d 100644 --- a/osu.Game/Overlays/Options/OptionsSideNav.cs +++ b/osu.Game/Overlays/Options/OptionsSideNav.cs @@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Options public class OptionsSideNav : Container { private FlowContainer content; - protected override Container Content => content; + protected override Container Content => content; public OptionsSideNav() { From 2cbb74a2b80f6ececc9e1beddadbc3c1dd177400 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 9 Nov 2016 08:00:44 +0900 Subject: [PATCH 4/4] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 478d0dd295..b8d0a0050b 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 478d0dd295a66c99556ca8039453e0f806ff4e9b +Subproject commit b8d0a0050be25aec4333134ca18497340e1154a7