add:图标

This commit is contained in:
2025-10-04 14:55:49 +08:00
parent 3f28bc5c6c
commit 8f627c6b7f
4 changed files with 19 additions and 10 deletions
+2
View File
@@ -225,6 +225,7 @@
<Resource Include="Resources\Icons-png\icc.png" /> <Resource Include="Resources\Icons-png\icc.png" />
<Resource Include="Resources\Icons-png\icc-dark.png" /> <Resource Include="Resources\Icons-png\icc-dark.png" />
<Resource Include="Resources\Icons-png\icc-noshadow.png" /> <Resource Include="Resources\Icons-png\icc-noshadow.png" />
<Resource Include="Resources\Icons-png\icc-sharpdark.png" />
<Resource Include="Resources\Icons-png\InkCanvas.png" /> <Resource Include="Resources\Icons-png\InkCanvas.png" />
<Resource Include="Resources\Icons-png\kuanciya.png" /> <Resource Include="Resources\Icons-png\kuanciya.png" />
<Resource Include="Resources\Icons-png\kuandogeyuanliangwo.png" /> <Resource Include="Resources\Icons-png\kuandogeyuanliangwo.png" />
@@ -532,6 +533,7 @@
<None Remove="Resources\Icons-png\icc.png" /> <None Remove="Resources\Icons-png\icc.png" />
<None Remove="Resources\Icons-png\icc-dark.png" /> <None Remove="Resources\Icons-png\icc-dark.png" />
<None Remove="Resources\Icons-png\icc-noshadow.png" /> <None Remove="Resources\Icons-png\icc-noshadow.png" />
<None Remove="Resources\Icons-png\icc-sharpdark.png" />
<None Remove="Resources\Icons-png\idt.png" /> <None Remove="Resources\Icons-png\idt.png" />
<None Remove="Resources\Icons-png\InkCanvas.png" /> <None Remove="Resources\Icons-png\InkCanvas.png" />
<None Remove="Resources\Icons-png\kuanciya.png" /> <None Remove="Resources\Icons-png\kuanciya.png" />
+1
View File
@@ -1080,6 +1080,7 @@
<ComboBoxItem Content="“ICC-CE”黑色透明版" FontFamily="Microsoft YaHei UI" /> <ComboBoxItem Content="“ICC-CE”黑色透明版" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="“ICC-CE”无阴影" FontFamily="Microsoft YaHei UI" /> <ComboBoxItem Content="“ICC-CE”无阴影" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="“ICC-CE”深色" FontFamily="Microsoft YaHei UI" /> <ComboBoxItem Content="“ICC-CE”深色" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="“ICC-CE”深色呼吸版" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="酷安斗鸡眼滑稽" FontFamily="Microsoft YaHei UI" /> <ComboBoxItem Content="酷安斗鸡眼滑稽" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="酷安受虐滑稽" FontFamily="Microsoft YaHei UI" /> <ComboBoxItem Content="酷安受虐滑稽" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="酷安呲牙笑" FontFamily="Microsoft YaHei UI" /> <ComboBoxItem Content="酷安呲牙笑" FontFamily="Microsoft YaHei UI" />
+16 -10
View File
@@ -368,43 +368,49 @@ namespace Ink_Canvas
else if (index == 4) else if (index == 4)
{ {
FloatingbarHeadIconImg.Source = FloatingbarHeadIconImg.Source =
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png")); new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc-sharpdark.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5); FloatingbarHeadIconImg.Margin = new Thickness(0.5);
} }
else if (index == 5) else if (index == 5)
{ {
FloatingbarHeadIconImg.Source = 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); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
} }
else if (index == 6) else if (index == 6)
{ {
FloatingbarHeadIconImg.Source = 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); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
} }
else if (index == 7) else if (index == 7)
{ {
FloatingbarHeadIconImg.Source = 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); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
} }
else if (index == 8) else if (index == 8)
{ {
FloatingbarHeadIconImg.Source = 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); FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
} }
else if (index == 9) 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 = FloatingbarHeadIconImg.Source =
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png")); new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1); 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 try
{ {
FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath)); FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath));
@@ -421,8 +427,8 @@ namespace Ink_Canvas
public void UpdateCustomIconsInComboBox() public void UpdateCustomIconsInComboBox()
{ {
// 保留前10个内置图标选项 // 保留前11个内置图标选项
while (ComboBoxFloatingBarImg.Items.Count > 10) while (ComboBoxFloatingBarImg.Items.Count > 11)
{ {
ComboBoxFloatingBarImg.Items.RemoveAt(ComboBoxFloatingBarImg.Items.Count - 1); ComboBoxFloatingBarImg.Items.RemoveAt(ComboBoxFloatingBarImg.Items.Count - 1);
} }
Binary file not shown.

After

Width:  |  Height:  |  Size: 259 KiB