From e1834fdc74b1b800e92e4feb77959ae5facd7d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E5=BD=AA?= <1315508912@qq.com>
Date: Wed, 20 Dec 2023 22:15:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86tips=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewDownloadFinished.axaml                | 29 ++++++--------
 .../DownloadManager/ViewDownloading.axaml     | 38 +++++--------------
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml b/DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml
index ea112d8..51c9ffd 100644
--- a/DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml
+++ b/DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml
@@ -1,14 +1,11 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converter="clr-namespace:DownKyi.Converter"
              x:Class="DownKyi.Views.DownloadManager.ViewDownloadFinished"
              xmlns:vmdm="clr-namespace:DownKyi.ViewModels.DownloadManager"
              x:DataType="vmdm:ViewDownloadFinishedViewModel"
              xmlns:i="using:Avalonia.Xaml.Interactivity"
              xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions">
     <UserControl.Resources>
-        <converter:CountConverter x:Key="CountConverter" Count="0" />
-        
         <ControlTheme x:Key="DownloadedStyle" TargetType="{x:Type ListBoxItem}" x:DataType="vmdm:DownloadedItem">
             <Setter Property="Template">
                 <Setter.Value>
@@ -37,6 +34,16 @@
                                         FontSize="14"
                                         Foreground="{DynamicResource BrushTextDark}"
                                         TextTrimming="CharacterEllipsis">
+                                        <ToolTip.Tip>
+                                            <TextBlock>
+                                                <TextBlock.Text>
+                                                    <MultiBinding StringFormat="{}{0}-{1}">
+                                                        <Binding Path="MainTitle" />
+                                                        <Binding Path="Name" />
+                                                    </MultiBinding>
+                                                </TextBlock.Text>
+                                            </TextBlock>
+                                        </ToolTip.Tip>
                                         <TextBlock.Text>
                                             <MultiBinding StringFormat="{}{0}-{1}-{2}">
                                                 <Binding Path="Order" />
@@ -44,18 +51,6 @@
                                                 <Binding Path="Name" />
                                             </MultiBinding>
                                         </TextBlock.Text>
-                                        <ContentControl>
-                                            <ToolTip.Tip>
-                                                <TextBlock>
-                                                    <TextBlock.Text>
-                                                        <MultiBinding StringFormat="{}{0}-{1}">
-                                                            <Binding Path="MainTitle" />
-                                                            <Binding Path="Name" />
-                                                        </MultiBinding>
-                                                    </TextBlock.Text>
-                                                </TextBlock>
-                                            </ToolTip.Tip>
-                                        </ContentControl>
                                     </TextBlock>
 
                                     <TextBlock
@@ -211,7 +206,7 @@
                 </StackPanel>
 
                 <ComboBox
-                    Name="nameFinishedSort"
+                    Name="NameFinishedSort"
                     Grid.Column="1"
                     Width="120"
                     HorizontalAlignment="Left"
@@ -220,7 +215,7 @@
                     <i:Interaction.Behaviors>
                         <ia:EventTriggerBehavior EventName="SelectionChanged">
                             <ia:InvokeCommandAction Command="{Binding FinishedSortCommand}"
-                                                    CommandParameter="{Binding ElementName=nameFinishedSort, Path=SelectedIndex}" />
+                                                    CommandParameter="{Binding ElementName=NameFinishedSort, Path=SelectedIndex}" />
                         </ia:EventTriggerBehavior>
                     </i:Interaction.Behaviors>
                     <ComboBoxItem Content="{DynamicResource DownloadedSortByTime}" />
diff --git a/DownKyi/Views/DownloadManager/ViewDownloading.axaml b/DownKyi/Views/DownloadManager/ViewDownloading.axaml
index bc66023..4713153 100644
--- a/DownKyi/Views/DownloadManager/ViewDownloading.axaml
+++ b/DownKyi/Views/DownloadManager/ViewDownloading.axaml
@@ -1,16 +1,11 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converter="clr-namespace:DownKyi.Converter"
              x:Class="DownKyi.Views.DownloadManager.ViewDownloading"
              xmlns:vmdm="clr-namespace:DownKyi.ViewModels.DownloadManager"
              x:DataType="vmdm:ViewDownloadingViewModel"
-             xmlns:prism="http://prismlibrary.com/"
-             prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:i="using:Avalonia.Xaml.Interactivity"
              xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions">
     <UserControl.Resources>
-        <converter:CountConverter x:Key="CountConverter" Count="0" />
-
         <ControlTheme x:Key="DownloadingStyle" TargetType="{x:Type ListBoxItem}" x:DataType="vmdm:DownloadingItem">
             <Setter Property="Template">
                 <Setter.Value>
@@ -38,28 +33,8 @@
                                         VerticalAlignment="Center"
                                         FontSize="14"
                                         Foreground="{DynamicResource BrushTextDark}"
-                                        TextTrimming="CharacterEllipsis"
-                                        ToolTip.Tip="">
-                                        <TextBlock.Text>
-                                            <MultiBinding StringFormat="{}{0}-{1}-{2}">
-                                                <Binding Path="Order" />
-                                                <Binding Path="MainTitle" />
-                                                <Binding Path="Name" />
-                                            </MultiBinding>
-                                        </TextBlock.Text>
-                                        <ContentControl>
-                                            <ToolTip.Tip>
-                                                <TextBlock>
-                                                    <TextBlock.Text>
-                                                        <MultiBinding StringFormat="{}{0}-{1}">
-                                                            <Binding Path="MainTitle" />
-                                                            <Binding Path="Name" />
-                                                        </MultiBinding>
-                                                    </TextBlock.Text>
-                                                </TextBlock>
-                                            </ToolTip.Tip>
-                                        </ContentControl>
-                                        <!--<TextBlock.ToolTip>
+                                        TextTrimming="CharacterEllipsis">
+                                        <ToolTip.Tip>
                                             <TextBlock>
                                                 <TextBlock.Text>
                                                     <MultiBinding StringFormat="{}{0}-{1}">
@@ -68,7 +43,14 @@
                                                     </MultiBinding>
                                                 </TextBlock.Text>
                                             </TextBlock>
-                                        </TextBlock.ToolTip>-->
+                                        </ToolTip.Tip>
+                                        <TextBlock.Text>
+                                            <MultiBinding StringFormat="{}{0}-{1}-{2}">
+                                                <Binding Path="Order" />
+                                                <Binding Path="MainTitle" />
+                                                <Binding Path="Name" />
+                                            </MultiBinding>
+                                        </TextBlock.Text>
                                     </TextBlock>
 
                                     <TextBlock