Adjust style.

karaoke-dev · Nov 1, 2020 · 2f1db9d · 2f1db9d
1 parent bb2ad96
commit 2f1db9d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/TestSceneSinger.cs
@@ -35,20 +35,23 @@ public TestSceneSinger()
                 singer.RomajiName = "Hatsune Miku";
                 singer.EnglishName = "Miku";
                 singer.Description = "International superstar vocaloid Hatsune Miku.";
+                singer.Color = Colour4.AliceBlue;
             });
             karaokeBeatmap.SingerMetadata.CreateSinger(singer =>
             {
                 singer.Name = "ハク";
                 singer.RomajiName = "haku";
                 singer.EnglishName = "andy840119";
                 singer.Description = "Creator of this ruleset.";
+                singer.Color = Colour4.Yellow;
             });
             karaokeBeatmap.SingerMetadata.CreateSinger(singer =>
             {
                 singer.Name = "ゴミパソコン";
                 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
@@ -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
@@ -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
@@ -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
@@ -87,7 +87,5 @@ public override bool SetContent(object content)
 
             return true;
         }
-
-
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,5 @@ public override bool SetContent(object content) @@
                 return true;
             }
         }
     }