Use badge if in small size.

karaoke-dev · Dec 6, 2020 · 10f5b92 · 10f5b92
1 parent e44b1f7
commit 10f5b92
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 47 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/Badges/LanguageInfoBadge.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/Badges/LanguageInfoBadge.cs
@@ -0,0 +1,32 @@
+// Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Karaoke.Objects;
+
+namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges
+{
+    public class LanguageInfoBadge : Badge
+    {
+        public LanguageInfoBadge(Lyric lyric)
+            : base(lyric)
+        {
+            lyric.LanguageBindable.BindValueChanged(value =>
+            {
+                var language = value.NewValue;
+
+                if (language == null)
+                    BadgeText = "None";
+                else
+                    BadgeText = language.DisplayName;
+            }, true);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BadgeColour = colours.BlueDarker;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/Badges/TimeInfoBadge.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/Badges/TimeInfoBadge.cs
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/DrawableLyricEditListItem.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/DrawableLyricEditListItem.cs
@@ -9,6 +9,7 @@
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components;
+using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Badges;
 using osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Infos;
 using osu.Game.Rulesets.Karaoke.Objects;
 using osuTK;
@@ -76,7 +77,9 @@ protected override Drawable CreateContent()
                             {
                                 new Container
                                 {
+                                    // todo : cannot use relative size to both because it will cause size cannot roll-back if make lyric smaller.
                                     RelativeSizeAxes = Axes.X,
+                                    Height = min_height,
                                     Children = new Drawable[]
                                     {
                                         headerBackground = new Box
@@ -93,12 +96,19 @@ protected override Drawable CreateContent()
                                             Anchor = Anchor.TopRight,
                                             Origin = Anchor.TopRight,
                                             Spacing = new Vector2(5),
-                                            Children = new []
+                                            Children = new Drawable[]
                                             {
                                                 new TimeInfoContainer(Model)
                                                 {
                                                     RelativeSizeAxes = Axes.X,
                                                     Height = 36,
+                                                },
+
+                                                // todo : in small display size use badge.
+                                                // in larger size should use real icon.
+                                                new LanguageInfoBadge(Model)
+                                                {
+                                                    Margin = new MarginPadding{ Right = 5 }
                                                 }
                                             }
                                         },

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric.cs
@@ -122,13 +122,21 @@ public int LayoutIndex
         [JsonIgnore]
         public readonly Bindable<string> TranslateTextBindable = new Bindable<string>();
 
-        public CultureInfo Language { get; set; }
-
         /// <summary>
         /// Translates
         /// </summary>
         public IDictionary<int, string> Translates { get; set; } = new Dictionary<int, string>();
 
+
+        [JsonIgnore]
+        public readonly Bindable<CultureInfo> LanguageBindable = new Bindable<CultureInfo>();
+
+        public CultureInfo Language
+        {
+            get => LanguageBindable.Value;
+            set => LanguageBindable.Value = value;
+        }
+
         /// <summary>
         /// Display target translate
         /// </summary>