From 2f1db9d39c697af884028326f946a6ca15b82a09 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 1 Nov 2020 16:07:38 +0900 Subject: [PATCH] Adjust style. --- osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs | 3 +++ .../Edit/Singers/Components/LyricPlacementColumn.cs | 2 +- .../Edit/Singers/Components/SingerLyricPlacementColumn.cs | 2 +- .../Edit/Singers/SingerRearrangeableListContainer.cs | 2 +- osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs | 2 -- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs index 0e8976dc3..d07d796a3 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs @@ -35,6 +35,7 @@ public TestSceneSinger() singer.RomajiName = "Hatsune Miku"; singer.EnglishName = "Miku"; singer.Description = "International superstar vocaloid Hatsune Miku."; + singer.Color = Colour4.AliceBlue; }); karaokeBeatmap.SingerMetadata.CreateSinger(singer => { @@ -42,6 +43,7 @@ public TestSceneSinger() singer.RomajiName = "haku"; singer.EnglishName = "andy840119"; singer.Description = "Creator of this ruleset."; + singer.Color = Colour4.Yellow; }); karaokeBeatmap.SingerMetadata.CreateSinger(singer => { @@ -49,6 +51,7 @@ public TestSceneSinger() singer.RomajiName = "gomi-pasokonn"; singer.EnglishName = "garbage desktop"; singer.Description = "My fucking slow desktop."; + singer.Color = Colour4.Brown; }); editorBeatmap = new EditorBeatmap(karaokeBeatmap); diff --git a/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/LyricPlacementColumn.cs b/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/LyricPlacementColumn.cs index e4c225f22..51e31a649 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/LyricPlacementColumn.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/LyricPlacementColumn.cs @@ -69,7 +69,7 @@ private void load(OverlayColourProvider colourProvider) protected abstract float SingerInfoSize { get; } - protected abstract Drawable CreateSingerInfo(Singer singer) ; + protected abstract Drawable CreateSingerInfo(Singer singer); protected class SingerLyricBlueprintContainer : BlueprintContainer { diff --git a/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/SingerLyricPlacementColumn.cs b/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/SingerLyricPlacementColumn.cs index c4adef07c..5c6ad0bf9 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/SingerLyricPlacementColumn.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Singers/Components/SingerLyricPlacementColumn.cs @@ -48,7 +48,7 @@ public DrawableSingerInfo(Singer singer) Name = "Background", RelativeSizeAxes = Axes.Both, Colour = singer.Color ?? new Color4(), - Alpha = singer.Color != null ? 1 : 0 + Alpha = singer.Color != null ? 0.3f : 0 }, new GridContainer { diff --git a/osu.Game.Rulesets.Karaoke/Edit/Singers/SingerRearrangeableListContainer.cs b/osu.Game.Rulesets.Karaoke/Edit/Singers/SingerRearrangeableListContainer.cs index a68e9351e..dc03e504a 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Singers/SingerRearrangeableListContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Singers/SingerRearrangeableListContainer.cs @@ -34,7 +34,7 @@ protected override Drawable CreateContent() Masking = true, CornerRadius = 5, RelativeSizeAxes = Axes.X, - Height = 120, + Height = 90, Margin = new MarginPadding { Top = 5 }, Children = new Drawable[] { diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs index 6d5c54585..11e357469 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs @@ -87,7 +87,5 @@ public override bool SetContent(object content) return true; } - - } }