From e5f948dccc4d68e13d3fe6de6f62ed698037768f Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 31 Oct 2016 16:16:11 -0600 Subject: [PATCH 1/6] Fade song select wedges in --- osu.Game/GameModes/Play/PlaySongSelect.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index 309cd3119b..fd552971a7 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -35,6 +35,7 @@ namespace osu.Game.GameModes.Play private ScrollContainer scrollContainer; private FlowContainer beatmapSetFlow; private TrackManager trackManager; + private Container wedgeContainer; /// Optionally provide a database to use instead of the OsuGame one. public PlaySongSelect(BeatmapDatabase database = null) @@ -45,7 +46,7 @@ namespace osu.Game.GameModes.Play const float bottomToolHeight = 50; Children = new Drawable[] { - new Container + wedgeContainer = new Container { RelativeSizeAxes = Axes.Both, Size = Vector2.One, @@ -141,6 +142,8 @@ namespace osu.Game.GameModes.Play trackManager = game.Audio.Track; Task.Factory.StartNew(addBeatmapSets); + + wedgeContainer.FadeInFromZero(250); } protected override void OnEntering(GameMode last) From 0edfeaaff928dd843807cd376cd1ce9a2bf0f396 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 1 Nov 2016 09:22:49 -0600 Subject: [PATCH 2/6] Move wedgeContainer transition to OnEntering --- osu.Game/GameModes/Play/PlaySongSelect.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index fd552971a7..b7f61f9f8a 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -142,14 +142,13 @@ namespace osu.Game.GameModes.Play trackManager = game.Audio.Track; Task.Factory.StartNew(addBeatmapSets); - - wedgeContainer.FadeInFromZero(250); } protected override void OnEntering(GameMode last) { base.OnEntering(last); ensurePlayingSelected(); + wedgeContainer.FadeInFromZero(250); } protected override void OnResuming(GameMode last) From 128ec8f7673e78c3e18d0f625ce59b7097648306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 1 Nov 2016 22:21:09 +0100 Subject: [PATCH 3/6] Fix beatmap panel border alpha being way too large. --- osu.Game/Beatmaps/Drawable/Panel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/Drawable/Panel.cs b/osu.Game/Beatmaps/Drawable/Panel.cs index b0c0821197..befcab40e8 100644 --- a/osu.Game/Beatmaps/Drawable/Panel.cs +++ b/osu.Game/Beatmaps/Drawable/Panel.cs @@ -53,7 +53,7 @@ namespace osu.Game.Beatmaps.Drawable protected virtual void Selected() { - BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 255); + BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 1f); GlowRadius = 10; BorderThickness = 2.5f; } From 50de8528a5414c89606d16307006e456121f6f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 1 Nov 2016 22:57:11 +0100 Subject: [PATCH 4/6] Use better glow in beatmap selection. --- osu.Game/Beatmaps/Drawable/Panel.cs | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/osu.Game/Beatmaps/Drawable/Panel.cs b/osu.Game/Beatmaps/Drawable/Panel.cs index b0c0821197..e1c7f41d28 100644 --- a/osu.Game/Beatmaps/Drawable/Panel.cs +++ b/osu.Game/Beatmaps/Drawable/Panel.cs @@ -23,7 +23,6 @@ namespace osu.Game.Beatmaps.Drawable Masking = true; CornerRadius = 10; BorderColour = new Color4(221, 255, 255, 0); - GlowColour = new Color4(102, 204, 255, 100); RelativeSizeAxes = Axes.X; } @@ -54,21 +53,29 @@ namespace osu.Game.Beatmaps.Drawable protected virtual void Selected() { BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 255); - GlowRadius = 10; BorderThickness = 2.5f; + + EdgeEffect = new EdgeEffect + { + Type = EdgeEffectType.Glow, + Colour = new Color4(150, 204, 255, 150), + Radius = 20, + Roundness = 10, + }; } protected virtual void Deselected() { BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 0); - GlowRadius = 0; BorderThickness = 0; + + EdgeEffect = new EdgeEffect { Type = EdgeEffectType.None }; } - protected override bool OnClick(InputState state) - { - State = PanelSelectedState.Selected; - return true; + protected override bool OnClick(InputState state) + { + State = PanelSelectedState.Selected; + return true; } } From 617a3f5c4f0f99bdd72c6f299326491703ec819e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 2 Nov 2016 10:22:46 +0900 Subject: [PATCH 5/6] Adjust glow colour slightly. --- osu.Game/Beatmaps/Drawable/Panel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/Drawable/Panel.cs b/osu.Game/Beatmaps/Drawable/Panel.cs index e1c7f41d28..d2b1793b30 100644 --- a/osu.Game/Beatmaps/Drawable/Panel.cs +++ b/osu.Game/Beatmaps/Drawable/Panel.cs @@ -58,7 +58,7 @@ namespace osu.Game.Beatmaps.Drawable EdgeEffect = new EdgeEffect { Type = EdgeEffectType.Glow, - Colour = new Color4(150, 204, 255, 150), + Colour = new Color4(130, 204, 255, 150), Radius = 20, Roundness = 10, }; From 14ff355b183b37b3be9716bde3830eb1db27e7af Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 2 Nov 2016 16:47:24 +0900 Subject: [PATCH 6/6] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 059520c918..b0a06ff37b 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 059520c91803855835c734bb6d9b56e90238fe78 +Subproject commit b0a06ff37b1c9594b5d64bdcfca8c250bf2889b2