From c997e16cfb2e16a93bc58419f801795779e3c299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 11:55:11 +0200 Subject: [PATCH 1/8] Update Framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index c3a7ebd979..c57055dffe 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit c3a7ebd979c9a6b19871dc84337905f97c56a6aa +Subproject commit c57055dffeb068c701f195602f472cc8626c32a3 From 916bb742da3a3b038b3f223ce7a8ac7ad99ca1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 11:55:38 +0200 Subject: [PATCH 2/8] Don't call Container.Add within KeyCounterCollection.Reset. --- .../Tests/TestCaseKeyCounter.cs | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs index 87642f3004..7be7d24860 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs @@ -19,17 +19,22 @@ public override void Reset() { base.Reset(); - KeyCounterCollection kc = new KeyCounterCollection + Children = new[] { - Origin = Anchor.Centre, - Anchor = Anchor.Centre, - IsCounting = true + new KeyCounterCollection + { + Origin = Anchor.Centre, + Anchor = Anchor.Centre, + IsCounting = true, + Counters = new KeyCounter[] + { + new KeyCounterKeyboard(@"Z", Key.Z), + new KeyCounterKeyboard(@"X", Key.X), + new KeyCounterMouse(@"M1", MouseButton.Left), + new KeyCounterMouse(@"M2", MouseButton.Right), + }, + }, }; - Add(kc); - kc.AddKey(new KeyCounterKeyboard(@"Z", Key.Z)); - kc.AddKey(new KeyCounterKeyboard(@"X", Key.X)); - kc.AddKey(new KeyCounterMouse(@"M1", MouseButton.Left)); - kc.AddKey(new KeyCounterMouse(@"M2", MouseButton.Right)); } } } From 99c8f618af1c19ef46b03a7ca95e1825ce49c459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 11:55:52 +0200 Subject: [PATCH 3/8] Don't rely on return value of Container.Add. --- osu.Game/GameModes/Menu/ButtonSystem.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 87a78c335d..93701e6c18 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -113,14 +113,17 @@ public override void Load() buttonFlow.Position = new Vector2(wedge_width * 2 - (button_width + osuLogo.SizeForFlow / 4), 0); - buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P))); - buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), OnMulti, 0, Key.M))); - buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), OnChart))); + buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P)); + buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), OnMulti, 0, Key.M)); + buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), OnChart)); - buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P))); - buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), OnEdit, 0, Key.E))); - buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), OnDirect, 0, Key.D))); - buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q))); + buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P)); + buttonsTopLevel.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), OnEdit, 0, Key.E)); + buttonsTopLevel.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), OnDirect, 0, Key.D)); + buttonsTopLevel.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q)); + + buttonFlow.Add(buttonsPlay); + buttonFlow.Add(buttonsTopLevel); } protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) From d9486e790a1ca77e83d7c3aa6cc4b8b20011d3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 11:56:41 +0200 Subject: [PATCH 4/8] Use AddInternal instead of AddTopLevel. --- osu.Game/GameModes/OsuGameMode.cs | 3 +-- .../Graphics/Containers/ParallaxContainer.cs | 16 ++++++++-------- .../UserInterface/KeyCounterCollection.cs | 15 ++++++++------- osu.Game/OsuGameBase.cs | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/osu.Game/GameModes/OsuGameMode.cs b/osu.Game/GameModes/OsuGameMode.cs index d81d30f0d5..b0928d8214 100644 --- a/osu.Game/GameModes/OsuGameMode.cs +++ b/osu.Game/GameModes/OsuGameMode.cs @@ -41,7 +41,7 @@ protected override void OnEntering(GameMode last) } else if (bg != null) { - AddTopLevel(new ParallaxContainer + AddInternal(new ParallaxContainer { Depth = float.MinValue, Children = new[] @@ -51,7 +51,6 @@ protected override void OnEntering(GameMode last) }); } - base.OnEntering(last); } diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs index 3c6cb18162..183b0c054a 100644 --- a/osu.Game/Graphics/Containers/ParallaxContainer.cs +++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs @@ -14,21 +14,21 @@ class ParallaxContainer : Container public ParallaxContainer() { RelativeSizeAxes = Axes.Both; + AddInternal(content = new Container() + { + RelativeSizeAxes = Axes.Both, + Anchor = Anchor.Centre, + Origin = Anchor.Centre + }); } - private Container content = new Container() - { - RelativeSizeAxes = Axes.Both, - Anchor = Anchor.Centre, - Origin = Anchor.Centre - }; + private Container content; - protected override Container AddTarget => content; + protected override Container Content => content; public override void Load() { base.Load(); - Add(content); } protected override bool OnMouseMove(InputState state) diff --git a/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs b/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs index 288d1e2018..c9d22d2f06 100644 --- a/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs +++ b/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs @@ -22,18 +22,19 @@ public IEnumerable Counters set { foreach (var k in value) - AddKey(k); + addKey(k); + + Children = value; } } - public void AddKey(KeyCounter key) + private void addKey(KeyCounter key) { counters.Add(key); - key.IsCounting = this.IsCounting; - key.FadeTime = this.FadeTime; - key.KeyDownTextColor = this.KeyDownTextColor; - key.KeyUpTextColor = this.KeyUpTextColor; - base.Add(key); + key.IsCounting = IsCounting; + key.FadeTime = FadeTime; + key.KeyDownTextColor = KeyDownTextColor; + key.KeyUpTextColor = KeyUpTextColor; } public void ResetCount() diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 0f0a9116a0..bd3990d5ef 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -21,7 +21,7 @@ public class OsuGameBase : Framework.Game public Options Options; public APIAccess API; - protected override Container AddTarget => ratioContainer?.IsLoaded == true ? ratioContainer : base.AddTarget; + protected override Container Content => ratioContainer?.IsLoaded == true ? ratioContainer : base.Content; private RatioAdjust ratioContainer; From 934523e347044f1478b82687d7ac82e358bfae19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 13:31:16 +0200 Subject: [PATCH 5/8] Update framework version. --- osu-framework | 2 +- osu.Game/OsuGame.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu-framework b/osu-framework index c57055dffe..1f770847b2 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit c57055dffeb068c701f195602f472cc8626c32a3 +Subproject commit 1f770847b245e6d250e63e60c24e9e84131d15e7 diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index a524a4f925..fd0c92eabe 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -49,7 +49,7 @@ public override void Load() OnHome = delegate { MainMenu?.MakeCurrent(); }, OnSettings = delegate { Options.PoppedOut = !Options.PoppedOut; }, OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; }, - Alpha = 0.001f //fixes invalidation fuckup + Alpha = 0.001f, }, new VolumeControl { From 9ed0748d73e4fe4ea92e4c4ad5e7dee64074a3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 15:40:32 +0200 Subject: [PATCH 6/8] No need to enforce scheduling of task anymore. --- osu-framework | 2 +- osu.Game/GameModes/Menu/Intro.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index 1f770847b2..3f66bf6f8e 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 1f770847b245e6d250e63e60c24e9e84131d15e7 +Subproject commit 3f66bf6f8e2ef8c4970f9ddf81b97748d5423e19 diff --git a/osu.Game/GameModes/Menu/Intro.cs b/osu.Game/GameModes/Menu/Intro.cs index 78e0d15b0e..e70b2639cf 100644 --- a/osu.Game/GameModes/Menu/Intro.cs +++ b/osu.Game/GameModes/Menu/Intro.cs @@ -47,8 +47,7 @@ public override void Load() Scheduler.Add(delegate { welcome.Play(); - }, true); - + }); Scheduler.AddDelayed(delegate { From 5861e782e5c9af96287b171aae354ccf6999942d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 9 Oct 2016 16:02:25 +0200 Subject: [PATCH 7/8] Update Framework version. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 3f66bf6f8e..aaa35586b9 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 3f66bf6f8e2ef8c4970f9ddf81b97748d5423e19 +Subproject commit aaa35586b9e3243f90d17657c91a0371296483e3 From 0b08c8ba15052a42e887d8dc6395ad05a744b85a Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 10 Oct 2016 14:18:06 +0900 Subject: [PATCH 8/8] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index aaa35586b9..19252f6177 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit aaa35586b9e3243f90d17657c91a0371296483e3 +Subproject commit 19252f6177622908cfbbf3caed7ceca42e5832d6