Loading CountDownList/App.config +26 −2 Original line number Diff line number Diff line Loading @@ -8,14 +8,38 @@ <userSettings> <CountDownList.MiscSetting> <setting name="ScreenPosX" serializeAs="String"> <value>0</value> <value>32</value> </setting> <setting name="ScreenPosY" serializeAs="String"> <value>0</value> <value>32</value> </setting> <setting name="IsOpen" serializeAs="String"> <value>False</value> </setting> <setting name="BlurOpenType" serializeAs="String"> <value>None</value> </setting> <setting name="SmoothScroll" serializeAs="String"> <value>True</value> </setting> <setting name="Pref" serializeAs="String"> <value>True</value> </setting> <setting name="GaussianBlurMode" serializeAs="String"> <value>False</value> </setting> <setting name="BorderRadius" serializeAs="String"> <value>8</value> </setting> <setting name="AutoOpen" serializeAs="String"> <value>False</value> </setting> <setting name="AutoOpenLabel" serializeAs="String"> <value>False</value> </setting> <setting name="HomePreview" serializeAs="String"> <value>False</value> </setting> </CountDownList.MiscSetting> </userSettings> </configuration> No newline at end of file CountDownList/AssemblyInfo.cs +1 −1 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ using System.Windows; // // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 方法是按如下所示使用“*”: [assembly: AssemblyVersion("1.1.11.*")] [assembly: AssemblyVersion("1.2.0.*")] /// <summary> /// 使用此类前需要把[assembly: ComVisible(false)]改为true Loading CountDownList/Class/ListCore.cs +47 −15 Original line number Diff line number Diff line using System; #pragma warning disable CA1416 using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; Loading Loading @@ -155,6 +156,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -164,6 +167,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading Loading @@ -228,11 +236,14 @@ namespace CountDownList.Class DoingPanel.Children.Remove(lb);//从进行中移除控件 WcPanel.Children.Add(lb);//添加到已完成 if (MiscSetting.Default.Pref) { if (!IsUserVisible(lb, RootWindow)) { await Task.Delay(250); } } } if (WcE.IsExpanded && IsOpen && IsUserVisible(lb, RootWindow)) { Loading @@ -246,6 +257,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -255,6 +268,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading Loading @@ -360,6 +378,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -369,6 +389,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading Loading @@ -412,6 +437,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -421,6 +448,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading CountDownList/Class/ScrollViewer.cs +8 −1 Original line number Diff line number Diff line Loading @@ -57,7 +57,14 @@ namespace CountDownList Animation.From = VerticalOffset; Animation.To = ToValue; //动画速度 if (MiscSetting.Default.SmoothScroll) { Animation.Duration = TimeSpan.FromMilliseconds(200); } else { Animation.Duration = TimeSpan.FromMilliseconds(0); } //考虑到性能,可以降低动画帧数 //Timeline.SetDesiredFrameRate(Animation, 40); BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, Animation); Loading CountDownList/Controls/ListLabel.xaml +26 −35 Original line number Diff line number Diff line <UserControl x:Name="userControl" x:Class="CountDownList.Controls.ListLabel" <UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:CountDownList.Controls" xmlns:hc="https://handyorg.github.io/handycontrol" x:Name="userControl" x:Class="CountDownList.Controls.ListLabel" RenderOptions.BitmapScalingMode="HighQuality" TextOptions.TextHintingMode="Auto" RenderOptions.ClearTypeHint="Enabled" Loading Loading @@ -123,26 +124,27 @@ </DoubleAnimationUsingKeyFrames> </Storyboard> <SolidColorBrush x:Key="Light" Color="#FFF7F7F7"></SolidColorBrush> <SolidColorBrush x:Key="Dark" Color="#FF202020"></SolidColorBrush> <SolidColorBrush x:Key="Binding" Color="Yellow"></SolidColorBrush> <SolidColorBrush x:Key="Light" Color="#FFF7F7F7"/> <SolidColorBrush x:Key="Dark" Color="#FF202020"/> <SolidColorBrush x:Key="Binding" Color="Yellow"/> <ContextMenu x:Key="ContextMenu"> <MenuItem Name="Delete" Header="删除" Click="Delete_Click"> <MenuItem x:Name="Delete" Header="删除" Click="Delete_Click"> <MenuItem.Icon> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/1-Del.png"/> </MenuItem.Icon> </MenuItem> <MenuItem Name="Edit" Header="编辑" Click="Edit_Click"> <MenuItem x:Name="Edit" Header="编辑" Click="Edit_Click"> <MenuItem.Icon> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/3-Edit.png"/> </MenuItem.Icon> </MenuItem> <MenuItem Name="Share" Header="分享为图片" Click="Share_Click"> <MenuItem x:Name="Share" Header="分享为图片" Click="Share_Click"> <MenuItem.Icon> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/share.png"/> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/share.png"> </Image> </MenuItem.Icon> </MenuItem> </ContextMenu> Loading @@ -150,49 +152,40 @@ <Grid> <Border x:Name="bg" Margin="4,4,4,4" BorderBrush="#FFF7F7F7" CornerRadius="8,8,8,8" BorderThickness="2,2,2,2" Cursor="Hand" MouseLeftButtonUp="Border_MouseLeftButtonUp" ContextMenu="{DynamicResource ContextMenu}"> <Border.Background> <ImageBrush ImageSource="/UI/test.png" Stretch="UniformToFill"/> <ImageBrush ImageSource="/UI/test.png" Stretch="UniformToFill"> </ImageBrush> </Border.Background> <Grid> <Grid.Background> <ImageBrush/> </Grid.Background> <Grid/> <!--更多--> <Button Height="10" Width="20" Background="Transparent" BorderBrush="{x:Null}" Padding="-16,-16,-16,-16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0" Click="Button_Click" Visibility="Collapsed"> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/0-more.png" Height="20" Width="20"/> </Button> <Grid x:Name="grid" Visibility="Collapsed"> <TextBlock x:Name="TitleTextFull" Foreground="{DynamicResource Binding}" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,13,0,0" d:IsHidden="True"> 12331你好 </TextBlock> <TextBlock x:Name="TitleTextFull" Foreground="{DynamicResource Binding}" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,13,0,0" d:IsHidden="True"><Run Text="12331你好"/></TextBlock> <TextBlock x:Name="ProgressTextFull" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"> 100% </TextBlock> <TextBlock x:Name="ProgressTextFull" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"><Run Text="100%"/></TextBlock> <TextBlock x:Name="TimeTextFull" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"> 1天1516小时3分钟 </TextBlock> <TextBlock x:Name="TimeTextFull" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"><Run Text="1天1516小时3分钟"/></TextBlock> </Grid> <Grid x:Name="grid1"> <TextBlock x:Name="TitleText" Foreground="{DynamicResource Binding}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="8,8,0,0"> 12331你好 </TextBlock> <TextBlock x:Name="TitleText" Foreground="{DynamicResource Binding}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="8,8,0,0"><Run Text="12331你好"/></TextBlock> <TextBlock x:Name="ProgressText" HorizontalAlignment="Left" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="8,0,0,12"> 100% </TextBlock> <TextBlock x:Name="ProgressText" HorizontalAlignment="Left" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="8,0,0,12"><Run Text="100%"/></TextBlock> <TextBlock x:Name="TimeText" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,8,12"> 1天1516小时3分钟 </TextBlock> <TextBlock x:Name="TimeText" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,8,12"><Run Text="1天1516小时3分钟"/></TextBlock> </Grid> <Grid x:Name="ProgressBar"> <Border Height="6" CornerRadius="0,0,8,8" Background="#7FC7C7C7" VerticalAlignment="Bottom"/> <Border Background="#FF80C2FF" CornerRadius="0,0,8,8" Height="6" VerticalAlignment="Bottom"> <Border x:Name="border2" Height="6" CornerRadius="0,0,8,8" Background="#7FC7C7C7" VerticalAlignment="Bottom"/> <Border x:Name="border3" Background="#FF80C2FF" CornerRadius="0,0,8,8" Height="6" VerticalAlignment="Bottom"> <Border.Clip> <RectangleGeometry x:Name="ProgressRectangleGeometry" RadiusX="0" RadiusY="0" Rect="0,0,32,6"> </RectangleGeometry> <RectangleGeometry x:Name="ProgressRectangleGeometry" RadiusX="0" RadiusY="0" Rect="0,0,32,6"/> </Border.Clip> </Border> Loading @@ -200,8 +193,6 @@ </Grid> </Border> <Border x:Name="d" BorderBrush="#FFF7F7F7" BorderThickness="2,2,2,2" CornerRadius="8,8,8,8" Margin="4,4,4,4"> </Border> <Border x:Name="d" BorderBrush="#FFF7F7F7" BorderThickness="2,2,2,2" CornerRadius="8,8,8,8" Margin="4,4,4,4"/> </Grid> </UserControl> Loading
CountDownList/App.config +26 −2 Original line number Diff line number Diff line Loading @@ -8,14 +8,38 @@ <userSettings> <CountDownList.MiscSetting> <setting name="ScreenPosX" serializeAs="String"> <value>0</value> <value>32</value> </setting> <setting name="ScreenPosY" serializeAs="String"> <value>0</value> <value>32</value> </setting> <setting name="IsOpen" serializeAs="String"> <value>False</value> </setting> <setting name="BlurOpenType" serializeAs="String"> <value>None</value> </setting> <setting name="SmoothScroll" serializeAs="String"> <value>True</value> </setting> <setting name="Pref" serializeAs="String"> <value>True</value> </setting> <setting name="GaussianBlurMode" serializeAs="String"> <value>False</value> </setting> <setting name="BorderRadius" serializeAs="String"> <value>8</value> </setting> <setting name="AutoOpen" serializeAs="String"> <value>False</value> </setting> <setting name="AutoOpenLabel" serializeAs="String"> <value>False</value> </setting> <setting name="HomePreview" serializeAs="String"> <value>False</value> </setting> </CountDownList.MiscSetting> </userSettings> </configuration> No newline at end of file
CountDownList/AssemblyInfo.cs +1 −1 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ using System.Windows; // // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 方法是按如下所示使用“*”: [assembly: AssemblyVersion("1.1.11.*")] [assembly: AssemblyVersion("1.2.0.*")] /// <summary> /// 使用此类前需要把[assembly: ComVisible(false)]改为true Loading
CountDownList/Class/ListCore.cs +47 −15 Original line number Diff line number Diff line using System; #pragma warning disable CA1416 using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; Loading Loading @@ -155,6 +156,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -164,6 +167,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading Loading @@ -228,11 +236,14 @@ namespace CountDownList.Class DoingPanel.Children.Remove(lb);//从进行中移除控件 WcPanel.Children.Add(lb);//添加到已完成 if (MiscSetting.Default.Pref) { if (!IsUserVisible(lb, RootWindow)) { await Task.Delay(250); } } } if (WcE.IsExpanded && IsOpen && IsUserVisible(lb, RootWindow)) { Loading @@ -246,6 +257,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -255,6 +268,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading Loading @@ -360,6 +378,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -369,6 +389,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading Loading @@ -412,6 +437,8 @@ namespace CountDownList.Class } } if (MiscSetting.Default.Pref) { if (lb.IsMouseEnter || lb.Open) { await Task.Delay(15); Loading @@ -421,6 +448,11 @@ namespace CountDownList.Class await Task.Delay(75); } } else { await Task.Delay(10); } } } } Loading
CountDownList/Class/ScrollViewer.cs +8 −1 Original line number Diff line number Diff line Loading @@ -57,7 +57,14 @@ namespace CountDownList Animation.From = VerticalOffset; Animation.To = ToValue; //动画速度 if (MiscSetting.Default.SmoothScroll) { Animation.Duration = TimeSpan.FromMilliseconds(200); } else { Animation.Duration = TimeSpan.FromMilliseconds(0); } //考虑到性能,可以降低动画帧数 //Timeline.SetDesiredFrameRate(Animation, 40); BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, Animation); Loading
CountDownList/Controls/ListLabel.xaml +26 −35 Original line number Diff line number Diff line <UserControl x:Name="userControl" x:Class="CountDownList.Controls.ListLabel" <UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:CountDownList.Controls" xmlns:hc="https://handyorg.github.io/handycontrol" x:Name="userControl" x:Class="CountDownList.Controls.ListLabel" RenderOptions.BitmapScalingMode="HighQuality" TextOptions.TextHintingMode="Auto" RenderOptions.ClearTypeHint="Enabled" Loading Loading @@ -123,26 +124,27 @@ </DoubleAnimationUsingKeyFrames> </Storyboard> <SolidColorBrush x:Key="Light" Color="#FFF7F7F7"></SolidColorBrush> <SolidColorBrush x:Key="Dark" Color="#FF202020"></SolidColorBrush> <SolidColorBrush x:Key="Binding" Color="Yellow"></SolidColorBrush> <SolidColorBrush x:Key="Light" Color="#FFF7F7F7"/> <SolidColorBrush x:Key="Dark" Color="#FF202020"/> <SolidColorBrush x:Key="Binding" Color="Yellow"/> <ContextMenu x:Key="ContextMenu"> <MenuItem Name="Delete" Header="删除" Click="Delete_Click"> <MenuItem x:Name="Delete" Header="删除" Click="Delete_Click"> <MenuItem.Icon> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/1-Del.png"/> </MenuItem.Icon> </MenuItem> <MenuItem Name="Edit" Header="编辑" Click="Edit_Click"> <MenuItem x:Name="Edit" Header="编辑" Click="Edit_Click"> <MenuItem.Icon> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/3-Edit.png"/> </MenuItem.Icon> </MenuItem> <MenuItem Name="Share" Header="分享为图片" Click="Share_Click"> <MenuItem x:Name="Share" Header="分享为图片" Click="Share_Click"> <MenuItem.Icon> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/share.png"/> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/share.png"> </Image> </MenuItem.Icon> </MenuItem> </ContextMenu> Loading @@ -150,49 +152,40 @@ <Grid> <Border x:Name="bg" Margin="4,4,4,4" BorderBrush="#FFF7F7F7" CornerRadius="8,8,8,8" BorderThickness="2,2,2,2" Cursor="Hand" MouseLeftButtonUp="Border_MouseLeftButtonUp" ContextMenu="{DynamicResource ContextMenu}"> <Border.Background> <ImageBrush ImageSource="/UI/test.png" Stretch="UniformToFill"/> <ImageBrush ImageSource="/UI/test.png" Stretch="UniformToFill"> </ImageBrush> </Border.Background> <Grid> <Grid.Background> <ImageBrush/> </Grid.Background> <Grid/> <!--更多--> <Button Height="10" Width="20" Background="Transparent" BorderBrush="{x:Null}" Padding="-16,-16,-16,-16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0" Click="Button_Click" Visibility="Collapsed"> <Image RenderOptions.BitmapScalingMode="Fant" Source="/UI/Icon/0-more.png" Height="20" Width="20"/> </Button> <Grid x:Name="grid" Visibility="Collapsed"> <TextBlock x:Name="TitleTextFull" Foreground="{DynamicResource Binding}" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,13,0,0" d:IsHidden="True"> 12331你好 </TextBlock> <TextBlock x:Name="TitleTextFull" Foreground="{DynamicResource Binding}" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,13,0,0" d:IsHidden="True"><Run Text="12331你好"/></TextBlock> <TextBlock x:Name="ProgressTextFull" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"> 100% </TextBlock> <TextBlock x:Name="ProgressTextFull" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"><Run Text="100%"/></TextBlock> <TextBlock x:Name="TimeTextFull" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"> 1天1516小时3分钟 </TextBlock> <TextBlock x:Name="TimeTextFull" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource Binding}" Margin="0,0,0,12"><Run Text="1天1516小时3分钟"/></TextBlock> </Grid> <Grid x:Name="grid1"> <TextBlock x:Name="TitleText" Foreground="{DynamicResource Binding}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="8,8,0,0"> 12331你好 </TextBlock> <TextBlock x:Name="TitleText" Foreground="{DynamicResource Binding}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="8,8,0,0"><Run Text="12331你好"/></TextBlock> <TextBlock x:Name="ProgressText" HorizontalAlignment="Left" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="8,0,0,12"> 100% </TextBlock> <TextBlock x:Name="ProgressText" HorizontalAlignment="Left" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="8,0,0,12"><Run Text="100%"/></TextBlock> <TextBlock x:Name="TimeText" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,8,12"> 1天1516小时3分钟 </TextBlock> <TextBlock x:Name="TimeText" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="{DynamicResource Binding}" Margin="0,0,8,12"><Run Text="1天1516小时3分钟"/></TextBlock> </Grid> <Grid x:Name="ProgressBar"> <Border Height="6" CornerRadius="0,0,8,8" Background="#7FC7C7C7" VerticalAlignment="Bottom"/> <Border Background="#FF80C2FF" CornerRadius="0,0,8,8" Height="6" VerticalAlignment="Bottom"> <Border x:Name="border2" Height="6" CornerRadius="0,0,8,8" Background="#7FC7C7C7" VerticalAlignment="Bottom"/> <Border x:Name="border3" Background="#FF80C2FF" CornerRadius="0,0,8,8" Height="6" VerticalAlignment="Bottom"> <Border.Clip> <RectangleGeometry x:Name="ProgressRectangleGeometry" RadiusX="0" RadiusY="0" Rect="0,0,32,6"> </RectangleGeometry> <RectangleGeometry x:Name="ProgressRectangleGeometry" RadiusX="0" RadiusY="0" Rect="0,0,32,6"/> </Border.Clip> </Border> Loading @@ -200,8 +193,6 @@ </Grid> </Border> <Border x:Name="d" BorderBrush="#FFF7F7F7" BorderThickness="2,2,2,2" CornerRadius="8,8,8,8" Margin="4,4,4,4"> </Border> <Border x:Name="d" BorderBrush="#FFF7F7F7" BorderThickness="2,2,2,2" CornerRadius="8,8,8,8" Margin="4,4,4,4"/> </Grid> </UserControl>