From 78d9d39f6041c306f11d910ab59663c3fe12a08a Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Fri, 20 Sep 2024 23:15:41 +0900
Subject: [PATCH 1/2] Fix LyricBox UI

---
 OpenUtau/Controls/LyricBox.axaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenUtau/Controls/LyricBox.axaml b/OpenUtau/Controls/LyricBox.axaml
index d2dceaaa1..2309aa48c 100644
--- a/OpenUtau/Controls/LyricBox.axaml
+++ b/OpenUtau/Controls/LyricBox.axaml
@@ -27,10 +27,10 @@
         </ListBox.Styles>
         <ListBox.ItemTemplate>
           <DataTemplate>
-            <Grid Margin="0" Width="360" HorizontalAlignment="Left" Background="Transparent" PointerPressed="ListBox_PointerPressed">
-              <TextBlock Margin="4" Grid.Column="0" HorizontalAlignment="Left" IsHitTestVisible="False" Text="{Binding Alias}"/>
-              <TextBlock Margin="4,4,24,4" Grid.Column="1" HorizontalAlignment="Right" IsHitTestVisible="False" FontSize="10" Text="{Binding Source}"/>
-            </Grid>
+            <DockPanel Margin="0" Width="360" Background="Transparent" PointerPressed="ListBox_PointerPressed">
+              <TextBlock Margin="4" DockPanel.Dock="Left" IsHitTestVisible="False" Text="{Binding Alias}"/>
+              <TextBlock Margin="4" DockPanel.Dock="Right" HorizontalAlignment="Right" TextTrimming="CharacterEllipsis" IsHitTestVisible="False" FontSize="10" VerticalAlignment="Center" Text="{Binding Source}"/>
+            </DockPanel>
           </DataTemplate>
         </ListBox.ItemTemplate>
       </ListBox>

From cebff2ab1ad1339048aee7a3c7ef0b3a81c8df92 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 3 Nov 2024 20:39:19 +0900
Subject: [PATCH 2/2] Add tooltip to LyricBox

---
 OpenUtau/Controls/LyricBox.axaml         | 2 +-
 OpenUtau/ViewModels/LyricBoxViewModel.cs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenUtau/Controls/LyricBox.axaml b/OpenUtau/Controls/LyricBox.axaml
index 2309aa48c..c22c199fa 100644
--- a/OpenUtau/Controls/LyricBox.axaml
+++ b/OpenUtau/Controls/LyricBox.axaml
@@ -27,7 +27,7 @@
         </ListBox.Styles>
         <ListBox.ItemTemplate>
           <DataTemplate>
-            <DockPanel Margin="0" Width="360" Background="Transparent" PointerPressed="ListBox_PointerPressed">
+            <DockPanel Margin="0" Width="360" Background="Transparent" PointerPressed="ListBox_PointerPressed" ToolTip.Tip="{Binding Source}">
               <TextBlock Margin="4" DockPanel.Dock="Left" IsHitTestVisible="False" Text="{Binding Alias}"/>
               <TextBlock Margin="4" DockPanel.Dock="Right" HorizontalAlignment="Right" TextTrimming="CharacterEllipsis" IsHitTestVisible="False" FontSize="10" VerticalAlignment="Center" Text="{Binding Source}"/>
             </DockPanel>
diff --git a/OpenUtau/ViewModels/LyricBoxViewModel.cs b/OpenUtau/ViewModels/LyricBoxViewModel.cs
index a4a4fa8b6..3b5a0f957 100644
--- a/OpenUtau/ViewModels/LyricBoxViewModel.cs
+++ b/OpenUtau/ViewModels/LyricBoxViewModel.cs
@@ -7,7 +7,6 @@
 using OpenUtau.Core.Ustx;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using WanaKanaNet;
 
 namespace OpenUtau.App.ViewModels {
     class LyricBoxViewModel : ViewModelBase {
@@ -57,7 +56,7 @@ private void UpdateSuggestion() {
             var scheduler = TaskScheduler.FromCurrentSynchronizationContext();
             Task.Run(() => singer.GetSuggestions(Text).Select(oto => new SuggestionItem() {
                 Alias = oto.Alias,
-                Source = string.IsNullOrEmpty(oto.Set) ? singer.Id : $"{singer.Id} / {oto.Set}",
+                Source = string.IsNullOrEmpty(oto.Set) ? singer.Id : $"{oto.Set}",
             }).Take(32).ToList()).ContinueWith(task => {
                 Suggestions.Clear();
                 if (!string.IsNullOrEmpty(Text) && Core.Util.ActiveLyricsHelper.Inst.Current != null) {