diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index ba4979eb..6c8c692b 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -223,6 +223,7 @@
+
@@ -529,6 +530,7 @@
+
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 52bba97c..87ef3cf1 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -1070,9 +1070,10 @@
-
-
-
+
+
+
+
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 844260fd..178e4062 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -362,43 +362,49 @@ namespace Ink_Canvas
else if (index == 3)
{
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-dark.png"));
+ FloatingbarHeadIconImg.Margin = new Thickness(0.5);
}
else if (index == 4)
{
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 == 5)
{
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 == 6)
{
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 == 7)
{
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 == 8)
+ {
+ 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 == 9)
{
FloatingbarHeadIconImg.Source =
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1);
}
- else if (index >= 9 && index - 9 < Settings.Appearance.CustomFloatingBarImgs.Count)
+ else if (index >= 10 && index - 10 < Settings.Appearance.CustomFloatingBarImgs.Count)
{
// 使用自定义图标
- var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 9];
+ var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 10];
try
{
FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath));
@@ -415,8 +421,8 @@ namespace Ink_Canvas
public void UpdateCustomIconsInComboBox()
{
- // 保留前9个内置图标选项
- while (ComboBoxFloatingBarImg.Items.Count > 9)
+ // 保留前10个内置图标选项
+ while (ComboBoxFloatingBarImg.Items.Count > 10)
{
ComboBoxFloatingBarImg.Items.RemoveAt(ComboBoxFloatingBarImg.Items.Count - 1);
}
diff --git a/Ink Canvas/Resources/Icons-png/icc-dark.png b/Ink Canvas/Resources/Icons-png/icc-dark.png
index 88767ac7..ef81f25a 100644
Binary files a/Ink Canvas/Resources/Icons-png/icc-dark.png and b/Ink Canvas/Resources/Icons-png/icc-dark.png differ
diff --git a/Ink Canvas/Resources/Icons-png/icc-noshadow.png b/Ink Canvas/Resources/Icons-png/icc-noshadow.png
index ca4fc6a0..52ba1704 100644
Binary files a/Ink Canvas/Resources/Icons-png/icc-noshadow.png and b/Ink Canvas/Resources/Icons-png/icc-noshadow.png differ
diff --git a/Ink Canvas/Resources/Icons-png/icc.png b/Ink Canvas/Resources/Icons-png/icc.png
index 37d60ffc..d5c22258 100644
Binary files a/Ink Canvas/Resources/Icons-png/icc.png and b/Ink Canvas/Resources/Icons-png/icc.png differ