diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index 5876e023..c637cc45 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -226,6 +226,7 @@ + @@ -534,6 +535,7 @@ + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 286319f9..20c290fa 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -1081,6 +1081,7 @@ + diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index 19d01317..c5a726e3 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -374,43 +374,49 @@ namespace Ink_Canvas else if (index == 5) { FloatingbarHeadIconImg.Source = - new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png")); - FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); + new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc-transparent-light-small.png")); + FloatingbarHeadIconImg.Margin = new Thickness(0.5); } else if (index == 6) { FloatingbarHeadIconImg.Source = - new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png")); + new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png")); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); } else if (index == 7) { FloatingbarHeadIconImg.Source = - new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png")); + new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png")); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); } else if (index == 8) { FloatingbarHeadIconImg.Source = - new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png")); + new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png")); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); } else if (index == 9) { FloatingbarHeadIconImg.Source = - new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png")); + new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png")); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); } else if (index == 10) + { + FloatingbarHeadIconImg.Source = + new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png")); + FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); + } + else if (index == 11) { FloatingbarHeadIconImg.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png")); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1); } - else if (index >= 11 && index - 11 < Settings.Appearance.CustomFloatingBarImgs.Count) + else if (index >= 12 && index - 12 < Settings.Appearance.CustomFloatingBarImgs.Count) { // 使用自定义图标 - var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 11]; + var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 12]; try { FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath)); diff --git a/Ink Canvas/Resources/Icons-png/icc-transparent-light-small.png b/Ink Canvas/Resources/Icons-png/icc-transparent-light-small.png new file mode 100644 index 00000000..4e58fffc Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/icc-transparent-light-small.png differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index 57d842b8..c8c2dfbd 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache differ