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