Merge pull request #1286 from maiko3tattun/240920_LyricBoxAlignment

Fix LyricBox UI
stakira · Nov 11, 2024 · a0b1460 · a0b1460
2 parents d73ea6b + cebff2a
commit a0b1460
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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" 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>
           </DataTemplate>
         </ListBox.ItemTemplate>
       </ListBox>

diff --git 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) {