返回提交历史

XFEstudio/MyFirstRespo

增加下载图标

3122571

XFEstudio <mail@xfegzs.com>

提交于 2024-09-05 20:03

父提交 44c215b

代码差异

20 个文件 +343 -23

Modified XFEToolBox/Profiles/CrossVersionProfiles/DownloadProfile.cs +5 -0

@@ -21,6 +21,11 @@ public partial class DownloadProfile

21 21 [ProfileProperty]

22 22 private bool openFolderWhenComplete = true;

23 23 /// <summary>

24 /// 用户是否同意了下载协议

25 /// </summary>

26 [ProfileProperty]

27 private bool downloadAgreementAccepted = false;

28 /// <summary>

24 29 /// 下载的目标文件夹

25 30 /// </summary>

26 31 [ProfileProperty]

Added XFEToolBox/Resources/Image/check.png +0 -0

二进制文件已变更，无法进行逐行预览。

Added XFEToolBox/Resources/Image/steam_logo.png +0 -0

二进制文件已变更，无法进行逐行预览。

Added XFEToolBox/Resources/Image/wrench_tool.png +0 -0

二进制文件已变更，无法进行逐行预览。

Modified XFEToolBox/Resources/Style/MainStyle.xaml +7 -2

@@ -1,5 +1,5 @@

1 1 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

2 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard">

3 3 <Style x:Key="TabBorderStyle" TargetType="Border">

4 4 <Setter Property="Background" Value="{DynamicResource MainColor}"/>

5 5 <Setter Property="HorizontalAlignment" Value="Stretch"/>

@@ -159,8 +159,13 @@

159 159 <Setter.Value>

160 160 <ControlTemplate TargetType="ScrollBar">

161 161 <Track x:Name="PART_Track" IsDirectionReversed="True" Width="8" HorizontalAlignment="Right">

162 <Track.Resources>

163 <sys:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">

164 100

165 </sys:Double>

166 </Track.Resources>

162 167 <Track.Thumb>

163 <Thumb x:Name="Thumb" Width="8">

168 <Thumb x:Name="Thumb" Width="8" MinHeight="50">

164 169 <Thumb.Template>

165 170 <ControlTemplate TargetType="Thumb">

166 171 <Grid>

Modified XFEToolBox/Resources/Style/MyControlsStyle.xaml +24 -0

@@ -379,4 +379,28 @@

379 379 </Setter.Value>

380 380 </Setter>

381 381 </Style>

382 <Style TargetType="{x:Type ctr:CheckButton}">

383 <Setter Property="Template">

384 <Setter.Value>

385 <ControlTemplate TargetType="{x:Type ctr:CheckButton}">

386 <Grid>

387 <Grid.ColumnDefinitions>

388 <ColumnDefinition Width="25"/>

389 <ColumnDefinition Width="*"/>

390 </Grid.ColumnDefinitions>

391 <Grid>

392

                            <Border CornerRadius="20" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" BorderBrush="{DynamicResource MainColor}" BorderThickness="2"/>

393 <Image x:Name="checkImage" Source="/Resources/Image/check.png" Visibility="Hidden"/>

394 </Grid>

395 <ContentPresenter Grid.Column="1"/>

396 </Grid>

397 <ControlTemplate.Triggers>

398 <Trigger Property="IsChecked" Value="True">

399 <Setter TargetName="checkImage" Property="Visibility" Value="Visible"/>

400 </Trigger>

401 </ControlTemplate.Triggers>

402 </ControlTemplate>

403 </Setter.Value>

404 </Setter>

405 </Style>

382 406 </ResourceDictionary>

Modified XFEToolBox/ViewModel/Windows/MainWindowViewModel.cs +1 -1

@@ -45,7 +45,7 @@ public partial class MainWindowViewModel : ObservableObject

45 45 /// <summary>

46 46 /// 关闭窗体

47 47 /// </summary>

48 public void CloseWindow()

48 public static void CloseWindow()

49 49 {

50 50 AppCenter.ExitApp(false);

51 51 }

Added XFEToolBox/Views/Behavior/ScrollViewerBehavior.cs +12 -0

@@ -0,0 +1,12 @@

1 using System.Windows.Controls;

2 using System.Windows;

4 namespace XFEToolBox.Views.Behavior;

6 public static class ScrollViewerBehavior

7 {

    public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached("VerticalOffset", typeof(double), typeof(ScrollViewerBehavior), new UIPropertyMetadata(0d, OnVerticalOffsetChanged));

    public static void SetVerticalOffset(FrameworkElement target, double value) => target.SetValue(VerticalOffsetProperty, value);

10 public static double GetVerticalOffset(FrameworkElement target) => (double)target.GetValue(VerticalOffsetProperty);

    private static void OnVerticalOffsetChanged(DependencyObject target, DependencyPropertyChangedEventArgs e) => (target as ScrollViewer)?.ScrollToVerticalOffset((double)e.NewValue);

12 }

Added XFEToolBox/Views/Controls/CheckButton.cs +8 -0

@@ -0,0 +1,8 @@

1 using System.Windows.Controls;

3 namespace XFEToolBox.Views.Controls;

5 public class CheckButton : CheckBox

6 {

8 }

Added XFEToolBox/Views/Controls/SmoothScrollViewer.cs +37 -0

@@ -0,0 +1,37 @@

1 using System.Windows.Controls;

2 using System.Windows.Input;

3 using System.Windows.Media.Animation;

4 using XFEToolBox.Views.Behavior;

6 namespace XFEToolBox.Views.Controls;

8 public class SmoothScrollViewer : ScrollViewer

9 {

10 public long AnimateMilliseconds { get; set; } = 300;

11 private double lastLocation = 0;

12 protected override void OnMouseWheel(MouseWheelEventArgs e)

13 {

14 double wheelChange = e.Delta;

15 double newOffset = lastLocation - wheelChange;

16 ScrollToVerticalOffset(lastLocation);

17 if (newOffset < 0)

18 newOffset = 0;

19 if (newOffset > ScrollableHeight)

20 newOffset = ScrollableHeight;

21 AnimateScroll(newOffset);

22 lastLocation = newOffset;

23 e.Handled = true;

24 }

25 private void AnimateScroll(double toValue)

26 {

27 BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, null);

28 var animation = new DoubleAnimation

29 {

30 EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut },

31 From = VerticalOffset,

32 To = toValue,

33 Duration = TimeSpan.FromMilliseconds(AnimateMilliseconds)

34 };

35 BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, animation);

36 }

37 }

Added XFEToolBox/Views/Controls/ToolButton.xaml +109 -0

@@ -0,0 +1,109 @@

1 <UserControl x:Class="XFEToolBox.Views.Controls.ToolButton"

2 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

4 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

5 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

6 xmlns:local="clr-namespace:XFEToolBox.Views.Controls"

7 mc:Ignorable="d"

8 d:DesignHeight="450" d:DesignWidth="800" Name="toolButton">

9 <Grid>

10 <Grid.RowDefinitions>

11 <RowDefinition Height="50"/>

12 <RowDefinition Height="Auto"/>

13 <RowDefinition Height="25"/>

14 </Grid.RowDefinitions>

15 <Button Width="50" Height="50" Command="{Binding Command,ElementName=toolButton}">

16 <Button.Style>

17 <Style TargetType="Button">

18 <Setter Property="Template">

19 <Setter.Value>

20 <ControlTemplate TargetType="Button">

21 <Grid Width="50" Height="50">

22 <Border CornerRadius="10" Background="{DynamicResource MainColor}">

23 <Border.Clip>

24 <RectangleGeometry RadiusX="10" RadiusY="10" Rect="0,0,50,50"/>

25 </Border.Clip>

26 <Border.Effect>

27 <BlurEffect Radius="10"/>

28 </Border.Effect>

                                        <Image Width="45" Height="45" Source="{Binding IconSource,ElementName=toolButton}" VerticalAlignment="Center" HorizontalAlignment="Center">

30 <Image.Clip>

31 <RectangleGeometry RadiusX="10" RadiusY="10" Rect="0,0,45,45"/>

32 </Image.Clip>

33 </Image>

34 </Border>

35 <Border CornerRadius="10" BorderThickness="2" BorderBrush="#5050b7" Padding="3">

36 <Image Source="{Binding IconSource,ElementName=toolButton}">

37 <Image.Clip>

38 <RectangleGeometry RadiusX="10" RadiusY="10" Rect="0,0,40,40"/>

39 </Image.Clip>

40 </Image>

41 </Border>

42 <Border CornerRadius="10" Width="50" Height="50">

43 <Border.Background>

44 <SolidColorBrush x:Name="effectBorderBackground" Color="Black" Opacity="0"/>

45 </Border.Background>

46 </Border>

47 </Grid>

48 <ControlTemplate.Triggers>

49 <EventTrigger RoutedEvent="MouseEnter">

50 <BeginStoryboard>

51 <Storyboard>

                                                <DoubleAnimation Storyboard.TargetName="effectBorderBackground" Storyboard.TargetProperty="Opacity" To="0.2" Duration="0:0:0.3">

53 <DoubleAnimation.EasingFunction>

54 <CubicEase EasingMode="EaseOut"/>

55 </DoubleAnimation.EasingFunction>

56 </DoubleAnimation>

57 </Storyboard>

58 </BeginStoryboard>

59 </EventTrigger>

60 <EventTrigger RoutedEvent="MouseLeave">

61 <BeginStoryboard>

62 <Storyboard>

                                                <DoubleAnimation Storyboard.TargetName="effectBorderBackground" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:0.3">

64 <DoubleAnimation.EasingFunction>

65 <CubicEase EasingMode="EaseOut"/>

66 </DoubleAnimation.EasingFunction>

67 </DoubleAnimation>

68 </Storyboard>

69 </BeginStoryboard>

70 </EventTrigger>

71 <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">

72 <BeginStoryboard>

73 <Storyboard>

                                                <DoubleAnimation Storyboard.TargetName="effectBorderBackground" Storyboard.TargetProperty="Opacity" To="0.5" Duration="0:0:0.3">

75 <DoubleAnimation.EasingFunction>

76 <CubicEase EasingMode="EaseOut"/>

77 </DoubleAnimation.EasingFunction>

78 </DoubleAnimation>

79 </Storyboard>

80 </BeginStoryboard>

81 </EventTrigger>

82 <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">

83 <BeginStoryboard>

84 <Storyboard>

                                                <DoubleAnimation Storyboard.TargetName="effectBorderBackground" Storyboard.TargetProperty="Opacity" To="0.2" Duration="0:0:0.3">

86 <DoubleAnimation.EasingFunction>

87 <CubicEase EasingMode="EaseOut"/>

88 </DoubleAnimation.EasingFunction>

89 </DoubleAnimation>

90 </Storyboard>

91 </BeginStoryboard>

92 </EventTrigger>

93 </ControlTemplate.Triggers>

94 </ControlTemplate>

95 </Setter.Value>

96 </Setter>

97 </Style>

98 </Button.Style>

99 </Button>

100

        <Border Grid.Row="1" Width="40" Height="5" VerticalAlignment="Center" HorizontalAlignment="Center" BorderThickness="1" BorderBrush="{Binding ProgressBorderBrush,ElementName=toolButton}" Margin="0,2,0,2" CornerRadius="3" Visibility="{Binding ProgressVisibility,ElementName=toolButton}">

101

            <ProgressBar Value="{Binding ProgressValue,ElementName=toolButton}" Foreground="{Binding ProgressForeground,ElementName=toolButton}" Background="{Binding ProgressBackground,ElementName=toolButton}" BorderThickness="0" LargeChange="{Binding ProgressLargeChange,ElementName=toolButton}" SmallChange="{Binding ProgressSmallChange,ElementName=toolButton}">

102 <ProgressBar.Clip>

103 <RectangleGeometry RadiusX="3" RadiusY="3" Rect="0,0,38,3"/>

104 </ProgressBar.Clip>

105 </ProgressBar>

106 </Border>

107

        <TextBlock Grid.Row="2" Text="{Binding ToolName,ElementName=toolButton}" Foreground="{Binding TextColor,ElementName=toolButton}" VerticalAlignment="Center" HorizontalAlignment="Center"/>

108 </Grid>

109 </UserControl>

Added XFEToolBox/Views/Controls/ToolButton.xaml.cs +111 -0

@@ -0,0 +1,111 @@

1 using System.Windows;

2 using System.Windows.Controls;

3 using System.Windows.Input;

4 using System.Windows.Media;

5 using System.Windows.Media.Imaging;

7 namespace XFEToolBox.Views.Controls;

9 /// <summary>

10 /// ToolButton.xaml 的交互逻辑

11 /// </summary>

12 public partial class ToolButton : UserControl

13 {

14 #region DependencyProperty

15 public string ToolName

16 {

17 get { return (string)GetValue(ToolNameProperty); }

18 set { SetValue(ToolNameProperty, value); }

19 }

    public static readonly DependencyProperty ToolNameProperty = DependencyProperty.Register("ToolName", typeof(string), typeof(ToolButton), new PropertyMetadata("未命名工具"));

22 public ImageSource IconSource

23 {

24 get { return (ImageSource)GetValue(IconSourceProperty); }

25 set { SetValue(IconSourceProperty, value); }

26 }

    public static readonly DependencyProperty IconSourceProperty = DependencyProperty.Register("IconSource", typeof(ImageSource), typeof(ToolButton), new PropertyMetadata(new BitmapImage(new("pack://application:,,,/Resources/Image/wrench_tool.png"))));

29 public Brush TextColor

30 {

31 get { return (Brush)GetValue(TextColorProperty); }

32 set { SetValue(TextColorProperty, value); }

33 }

    public static readonly DependencyProperty TextColorProperty = DependencyProperty.Register("TextColor", typeof(Brush), typeof(ToolButton), new PropertyMetadata(new SolidColorBrush(Colors.White)));

36 public Brush ProgressForeground

37 {

38 get { return (Brush)GetValue(ProgressForegroundProperty); }

39 set { SetValue(ProgressForegroundProperty, value); }

40 }

    public static readonly DependencyProperty ProgressForegroundProperty = DependencyProperty.Register("ProgressForeground", typeof(Brush), typeof(ToolButton), new PropertyMetadata(new SolidColorBrush(Color.FromRgb(255, 151, 88))));

43 public Brush ProgressBackground

44 {

45 get { return (Brush)GetValue(ProgressBackgroundProperty); }

46 set { SetValue(ProgressBackgroundProperty, value); }

47 }

    public static readonly DependencyProperty ProgressBackgroundProperty = DependencyProperty.Register("ProgressBackground", typeof(Brush), typeof(ToolButton), new PropertyMetadata(new SolidColorBrush(Colors.White)));

50 public Brush ProgressBorderBrush

51 {

52 get { return (Brush)GetValue(ProgressBorderBrushProperty); }

53 set { SetValue(ProgressBorderBrushProperty, value); }

54 }

    public static readonly DependencyProperty ProgressBorderBrushProperty = DependencyProperty.Register("ProgressBorderBrush", typeof(Brush), typeof(ToolButton), new PropertyMetadata(new SolidColorBrush(Color.FromRgb(255, 151, 88))));

57 public double ProgressLargeChange

58 {

59 get { return (double)GetValue(ProgressLargeChangeProperty); }

60 set { SetValue(ProgressLargeChangeProperty, value); }

61 }

    public static readonly DependencyProperty ProgressLargeChangeProperty = DependencyProperty.Register("ProgressLargeChange", typeof(double), typeof(ToolButton), new PropertyMetadata(1d));

64 public double ProgressSmallChange

65 {

66 get { return (double)GetValue(ProgressSmallChangeProperty); }

67 set { SetValue(ProgressSmallChangeProperty, value); }

68 }

    public static readonly DependencyProperty ProgressSmallChangeProperty = DependencyProperty.Register("ProgressSmallChange", typeof(double), typeof(ToolButton), new PropertyMetadata(0.1d));

71 public double ProgressMaximum

72 {

73 get { return (double)GetValue(ProgressMaximumProperty); }

74 set { SetValue(ProgressMaximumProperty, value); }

75 }

    public static readonly DependencyProperty ProgressMaximumProperty = DependencyProperty.Register("ProgressMaximum", typeof(double), typeof(ToolButton), new PropertyMetadata(100d));

78 public double ProgressMinimum

79 {

80 get { return (double)GetValue(ProgressMinimumProperty); }

81 set { SetValue(ProgressMinimumProperty, value); }

82 }

    public static readonly DependencyProperty ProgressMinimumProperty = DependencyProperty.Register("ProgressMinimum", typeof(double), typeof(ToolButton), new PropertyMetadata(0d));

85 public double ProgressValue

86 {

87 get { return (double)GetValue(ProgressValueProperty); }

88 set { SetValue(ProgressValueProperty, value); }

89 }

    public static readonly DependencyProperty ProgressValueProperty = DependencyProperty.Register("ProgressValue", typeof(double), typeof(ToolButton), new PropertyMetadata(0d));

92 public Visibility ProgressVisibility

93 {

94 get { return (Visibility)GetValue(ProgressVisibilityProperty); }

95 set { SetValue(ProgressVisibilityProperty, value); }

96 }

    public static readonly DependencyProperty ProgressVisibilityProperty = DependencyProperty.Register("ProgressVisibility", typeof(Visibility), typeof(ToolButton), new PropertyMetadata(Visibility.Collapsed));

99 public ICommand Command

100 {

101 get { return (ICommand)GetValue(CommandProperty); }

102 set { SetValue(CommandProperty, value); }

103 }

104

    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(ToolButton), new PropertyMetadata(null));

105 #endregion

106

107 public ToolButton()

108 {

109 InitializeComponent();

110 }

111 }

Modified XFEToolBox/Views/Pages/ConsolePage.xaml +3 -2

@@ -3,6 +3,7 @@

3 3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

4 4 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

5 5 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

6 xmlns:ctr="clr-namespace:XFEToolBox.Views.Controls"

6 7 xmlns:local="clr-namespace:XFEToolBox.Views.Pages"

7 8 xmlns:viewmodel="clr-namespace:XFEToolBox.ViewModel.Pages"

8 9 mc:Ignorable="d"

@@ -62,13 +63,13 @@

62 63 </StackPanel>

63 64 </Grid>

64 65 <Border Grid.Column="0" Grid.Row="1" CornerRadius="0,0,15,0" Background="Black" Padding="0,5,3,5">

                <ScrollViewer x:Name="scrollViewer" VerticalScrollBarVisibility="Auto" IsTabStop="False" ScrollChanged="ScrollViewer_ScrollChanged">

                <ctr:SmoothScrollViewer x:Name="scrollViewer" AnimateMilliseconds="200" VerticalScrollBarVisibility="Auto" IsTabStop="False" ScrollChanged="ScrollViewer_ScrollChanged">

66 67 <ScrollViewer.Resources>

67 68 <Style TargetType="ScrollBar" BasedOn="{StaticResource ConsoleScrollBar}"/>

68 69 </ScrollViewer.Resources>

69 70 <StackPanel x:Name="consoleStackPanel">

70 71 </StackPanel>

71 </ScrollViewer>

72 </ctr:SmoothScrollViewer>

72 73 </Border>

73 74 </Grid>

74 75 </Border>

Modified XFEToolBox/Views/Pages/DownloadPage.xaml +11 -1

@@ -4,10 +4,20 @@

4 4 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

5 5 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

6 6 xmlns:viewmodel="clr-namespace:XFEToolBox.ViewModel.Pages"

7 xmlns:ctr="clr-namespace:XFEToolBox.Views.Controls"

7 8 xmlns:local="clr-namespace:XFEToolBox.Views.Pages"

8 9 mc:Ignorable="d"

9 10 d:DesignHeight="450" d:DesignWidth="800"

10 11 Title="DownloadPage" d:DataContext="{d:DesignInstance Type=viewmodel:DownloadPageViewModel}">

12 12

13 <Grid>

14 <ScrollViewer HorizontalScrollBarVisibility="Disabled">

15 <ScrollViewer.Resources>

16 <Style TargetType="ScrollBar" BasedOn="{StaticResource ConsoleScrollBar}"/>

17 </ScrollViewer.Resources>

18 <WrapPanel>

19 <ctr:ToolButton ToolName="Steam" IconSource="/Resources/Image/steam_logo.png"/>

20 </WrapPanel>

21 </ScrollViewer>

22 </Grid>

13 23 </Page>

Modified XFEToolBox/Views/Pages/MainPage.xaml +3 -12

@@ -3,6 +3,7 @@

3 3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

4 4 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

5 5 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

6 xmlns:ctr="clr-namespace:XFEToolBox.Views.Controls"

6 7 xmlns:local="clr-namespace:XFEToolBox.Views.Pages"

7 8 mc:Ignorable="d"

8 9 d:DesignHeight="450" d:DesignWidth="800"

@@ -19,19 +20,9 @@

19 20 </Grid.RowDefinitions>

20 21

        <TextBlock Margin="10,0" Text="最近使用" Foreground="{DynamicResource BackgroundColor}" FontSize="15" FontWeight="Bold"/>

21 22 <Border Grid.Row="1" Grid.ColumnSpan="2" CornerRadius="15" Background="White" Margin="10">

22 <ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Disabled">

23 <ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Disabled" Padding="5">

23 24 <WrapPanel>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

                    <Border Background="{DynamicResource MainColor}" CornerRadius="10" Width="50" Height="50" Margin="10"/>

25 <ctr:ToolButton IconSource="/Resources/Image/steam_logo.png"/>

35 26 </WrapPanel>

36 27 </ScrollViewer>

37 28 </Border>

Modified XFEToolBox/Views/Pages/SettingPage.xaml +2 -2

@@ -47,7 +47,7 @@

47 47 </Border>

48 48 </Grid>

49 49 </Border>

            <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Disabled" ScrollChanged="ScrollViewer_ScrollChanged">

            <ctr:SmoothScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Disabled" ScrollChanged="ScrollViewer_ScrollChanged">

51 51 <Grid>

52 52 <Grid.ColumnDefinitions>

53 53 <ColumnDefinition Width="*"/>

@@ -179,7 +179,7 @@

179 179 </Grid>

180 180 </StackPanel>

181 181 </Grid>

182 </ScrollViewer>

182 </ctr:SmoothScrollViewer>

183 183 </Grid>

184 184 </Border>

185 185 </Page>

Modified XFEToolBox/Views/Windows/MainWindow.xaml +1 -1

@@ -10,7 +10,7 @@

10 10 d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"

11 11

        Title="XFE工具箱" Height="460" Width="730" MinHeight="450" MinWidth="720" Background="Transparent" WindowStyle="None" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Icon="/Resources/Icon/XFEToolBoxIcon.ico" Loaded="Window_Loaded">

12 12

13 <Border CornerRadius="19" Background="{DynamicResource MainColor}" Margin="5">

13 <Border CornerRadius="19" Background="{DynamicResource MainColor}" Margin="5" ClipToBounds="True">

14 14 <Grid>

15 15 <Grid.ColumnDefinitions>

16 16 <ColumnDefinition Width="180"/>

Modified XFEToolBox/Views/Windows/MainWindow.xaml.cs +1 -1

@@ -27,7 +27,7 @@ namespace XFEToolBox.Views.Windows

27 27

28 28

        private void MinimizeImage_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e) => ViewModel.Minimize();

29 29

        private void CloseWindowImage_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e) => ViewModel.CloseWindow();

        private void CloseWindowImage_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e) => MainWindowViewModel.CloseWindow();

31 31

32 32 private void DragTabBorder_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)

33 33 {

Modified XFEToolBox/Views/Windows/PopupWindow.xaml +1 -1

@@ -11,7 +11,7 @@

11 11 <Window.Effect>

12 12 <DropShadowEffect BlurRadius="8" ShadowDepth="3" Direction="-45"/>

13 13 </Window.Effect>

    <Border CornerRadius="16" Background="{Binding PopupContentBackground}" BorderBrush="{Binding PopupBorder}" BorderThickness="{Binding PopupThickness}" Margin="10">

    <Border CornerRadius="16" Background="{Binding PopupContentBackground}" BorderBrush="{Binding PopupBorder}" BorderThickness="{Binding PopupThickness}" Margin="10" ClipToBounds="True">

15 15 <Grid>

16 16 <Grid.ColumnDefinitions>

17 17 <ColumnDefinition Width="*"/>

Modified XFEToolBox/XFEToolBox.csproj +7 -0

@@ -15,6 +15,7 @@

15 15 <None Remove="Resources\Icon\XFEToolBoxLogo.png" />

16 16 <None Remove="Resources\Icon\XFEToolBoxSplashScreen.png" />

17 17 <None Remove="Resources\Image\back.png" />

18 <None Remove="Resources\Image\check.png" />

18 19 <None Remove="Resources\Image\clean.png" />

19 20 <None Remove="Resources\Image\close.png" />

20 21 <None Remove="Resources\Image\console.png" />

@@ -26,11 +27,14 @@

26 27 <None Remove="Resources\Image\restart.png" />

27 28 <None Remove="Resources\Image\setting.png" />

28 29 <None Remove="Resources\Image\start.png" />

30 <None Remove="Resources\Image\steam_logo.png" />

29 31 <None Remove="Resources\Image\stop.png" />

30 32 <None Remove="Resources\Image\tabline.png" />

31 33 <None Remove="Resources\Image\toolbox.png" />

32 34 <None Remove="Resources\Image\visible.png" />

33 35 <None Remove="Resources\Image\wrench.png" />

36 <None Remove="Resources\Image\wrenchtool.png" />

37 <None Remove="Resources\Image\wrench_tool.png" />

34 38 </ItemGroup>

35 39

36 40 <ItemGroup>

@@ -47,6 +51,7 @@

47 51 <Resource Include="Resources\Icon\XFEToolBoxIcon.ico" />

48 52 <Resource Include="Resources\Icon\XFEToolBoxLogo.png" />

49 53 <Resource Include="Resources\Image\back.png" />

54 <Resource Include="Resources\Image\check.png" />

50 55 <Resource Include="Resources\Image\clean.png" />

51 56 <Resource Include="Resources\Image\close.png" />

52 57 <Resource Include="Resources\Image\console.png" />

@@ -58,6 +63,7 @@

58 63 <Resource Include="Resources\Image\restart.png" />

59 64 <Resource Include="Resources\Image\setting.png" />

60 65 <Resource Include="Resources\Image\start.png" />

66 <Resource Include="Resources\Image\steam_logo.png" />

61 67 <Resource Include="Resources\Image\stop.png" />

62 68 <Resource Include="Resources\Image\tabline.png" />

63 69 </ItemGroup>

@@ -76,6 +82,7 @@

76 82 <Resource Include="Resources\Image\toolbox.png" />

77 83 <Resource Include="Resources\Image\visible.png" />

78 84 <Resource Include="Resources\Image\wrench.png" />

85 <Resource Include="Resources\Image\wrench_tool.png" />

79 86 </ItemGroup>

80 87

81 88 </Project>