diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index 6c8c692b..5876e023 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -225,6 +225,7 @@ + @@ -532,6 +533,7 @@ + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index b2c0a9fd..44529c95 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -1080,6 +1080,7 @@ + diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index 3e8dc065..99d07242 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -368,43 +368,49 @@ namespace Ink_Canvas else if (index == 4) { 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-sharpdark.png")); + FloatingbarHeadIconImg.Margin = new Thickness(0.5); } else if (index == 5) { 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 == 6) { 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 == 7) { 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 == 8) { 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 == 9) + { + 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 == 10) { FloatingbarHeadIconImg.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png")); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1); } - else if (index >= 10 && index - 10 < Settings.Appearance.CustomFloatingBarImgs.Count) + else if (index >= 11 && index - 11 < Settings.Appearance.CustomFloatingBarImgs.Count) { // 使用自定义图标 - var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 10]; + var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 11]; try { FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath)); @@ -421,8 +427,8 @@ namespace Ink_Canvas public void UpdateCustomIconsInComboBox() { - // 保留前10个内置图标选项 - while (ComboBoxFloatingBarImg.Items.Count > 10) + // 保留前11个内置图标选项 + while (ComboBoxFloatingBarImg.Items.Count > 11) { ComboBoxFloatingBarImg.Items.RemoveAt(ComboBoxFloatingBarImg.Items.Count - 1); } diff --git a/Ink Canvas/Resources/Icons-png/icc-sharpdark.png b/Ink Canvas/Resources/Icons-png/icc-sharpdark.png new file mode 100644 index 00000000..4880795d Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/icc-sharpdark.png differ