renun/downkyicore
1
0
Fork 0
mirror of https://github.com/yaobiao131/downkyicore.git synced 2025-08-10 00:52:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复下载管理tips显示错误

Browse Source
This commit is contained in:
姚彪
2023-12-20 22:15:30 +08:00
parent 9deda53725
commit e1834fdc74
2 changed files with 22 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml
View File

@@ -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}" />

38
DownKyi/Views/DownloadManager/ViewDownloading.axaml
View File

@@ -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