CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:主题切换

Browse Source
This commit is contained in:
CJKmkp
2025-10-04 19:59:42 +08:00
parent 0ba5286c94
commit 47ffccff68
17 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/InkCanvasForClass.csproj
+31
View File
@@ -461,6 +461,37 @@
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\cube.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\arrow_white.png" />
<Resource Include="Resources\Icons-png\geo-icons\dashed-line_white.png" />
<Resource Include="Resources\Icons-png\geo-icons\dotted-line_white.png" />
<Resource Include="Resources\Icons-png\geo-icons\line_white.png" />
<Resource Include="Resources\Icons-png\geo-icons\paralle-lines_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\centered-square_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\centered-circle_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\centered-circle-dashed_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\centered-oval_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\square_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\cylinder_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\cone_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\cube_white.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\EasiNote.png" />
<Resource Include="Resources\Icons-png\EasiNote3C.png" />
Ink Canvas/MainWindow.xaml
+13 -13
View File
@@ -8579,7 +8579,7 @@
MouseDown="Image_MouseDown"
MouseUp="BtnDrawLine_Click" Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/line.png"
<Image Source="{DynamicResource GeoIconLine}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="画直线" FontSize="8" HorizontalAlignment="Center" />
@@ -8589,7 +8589,7 @@
MouseUp="BtnDrawDashedLine_Click"
Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/dashed-line.png"
<Image Source="{DynamicResource GeoIconDashedLine}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="画虚线" FontSize="8" HorizontalAlignment="Center" />
@@ -8599,7 +8599,7 @@
MouseUp="BtnDrawDotLine_Click"
Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/dotted-line.png"
<Image Source="{DynamicResource GeoIconDotLine}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="画点线" FontSize="8" HorizontalAlignment="Center" />
@@ -8608,7 +8608,7 @@
MouseDown="Image_MouseDown"
MouseUp="BtnDrawArrow_Click" Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/arrow.png"
<Image Source="{DynamicResource GeoIconArrow}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="画箭头" FontSize="8" HorizontalAlignment="Center" />
@@ -8619,7 +8619,7 @@
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-png/geo-icons/paralle-lines.png"
Source="{DynamicResource GeoIconParallelLine}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="4平行线" FontSize="8" HorizontalAlignment="Center" />
@@ -8628,7 +8628,7 @@
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-png/geo-icons/centered-square.png"
Source="{DynamicResource GeoIconRectangleCenter}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="中心正方" FontSize="8" HorizontalAlignment="Center" />
@@ -8636,7 +8636,7 @@
<ui:SimpleStackPanel MouseUp="BtnDrawCircle_Click" Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image
Source="/Resources/Icons-png/geo-icons/centered-circle.png"
Source="{DynamicResource GeoIconCircle}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="中心圆" FontSize="8" HorizontalAlignment="Center" />
@@ -8645,7 +8645,7 @@
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-png/geo-icons/centered-circle-dashed.png"
Source="{DynamicResource GeoIconDashedCircle}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2"
Height="19" Width="19" />
@@ -8655,7 +8655,7 @@
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-png/geo-icons/centered-oval.png"
Source="{DynamicResource GeoIconEllipseCenter}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="中心椭圆" FontSize="8" HorizontalAlignment="Center" />
@@ -8685,7 +8685,7 @@
Margin="4,0,4,6">
<ui:SimpleStackPanel MouseUp="BtnDrawCuboid_Click" Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/cube.png"
<Image Source="{DynamicResource GeoIconCuboid}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="长方体" FontSize="8" HorizontalAlignment="Center" />
@@ -8693,7 +8693,7 @@
<ui:SimpleStackPanel MouseUp="BtnDrawRectangle_Click"
Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/square.png"
<Image Source="{DynamicResource GeoIconRectangle}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="正方形" FontSize="8" HorizontalAlignment="Center" />
@@ -8701,14 +8701,14 @@
<ui:SimpleStackPanel MouseUp="BtnDrawCylinder_Click"
Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/cylinder.png"
<Image Source="{DynamicResource GeoIconCylinder}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="画圆柱" FontSize="8" HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseUp="BtnDrawCone_Click" Margin="0,0,0,0"
Height="38" Width="32" Orientation="Vertical">
<Image Source="/Resources/Icons-png/geo-icons/cone.png"
<Image Source="{DynamicResource GeoIconCone}"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="画圆锥" FontSize="8" HorizontalAlignment="Center" />
Ink Canvas/Resources/Icons-png/geo-icons/arrow_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 738 B

Ink Canvas/Resources/Icons-png/geo-icons/centered-circle-dashed_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

Ink Canvas/Resources/Icons-png/geo-icons/centered-circle_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

Ink Canvas/Resources/Icons-png/geo-icons/centered-oval_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Ink Canvas/Resources/Icons-png/geo-icons/centered-square_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 695 B

Ink Canvas/Resources/Icons-png/geo-icons/cone_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Ink Canvas/Resources/Icons-png/geo-icons/cube_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Ink Canvas/Resources/Icons-png/geo-icons/cylinder_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 878 B

Ink Canvas/Resources/Icons-png/geo-icons/dashed-line_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 281 B

Ink Canvas/Resources/Icons-png/geo-icons/dotted-line_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 B

Ink Canvas/Resources/Icons-png/geo-icons/line_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 753 B

Ink Canvas/Resources/Icons-png/geo-icons/paralle-lines_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

Ink Canvas/Resources/Icons-png/geo-icons/square_white.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 549 B

Ink Canvas/Resources/Styles/Dark.xaml
+16 -1
View File
@@ -44,7 +44,7 @@
<SolidColorBrush x:Key="HistoryWindowTextPrimaryBrush" Color="#f9fafb"/>
<SolidColorBrush x:Key="HistoryWindowTextSecondaryBrush" Color="#9ca3af"/>
<!-- 快速面板图标资源 - 深色主题 -->
<!-- 快速面板图标资源 -->
<BitmapImage x:Key="QuickPanelPersonMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_person_money_24_regular-light.png"/>
<BitmapImage x:Key="QuickPanelPeopleMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_people_money_24_regular-light.png"/>
<BitmapImage x:Key="QuickPanelTimerIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_timer_24_regular-light.png"/>
@@ -52,4 +52,19 @@
<BitmapImage x:Key="QuickPanelEndSlideshowIcon" UriSource="/Resources/new-icons/end-slides-show-light.png"/>
<BitmapImage x:Key="QuickPanelEyeIcon" UriSource="/Resources/new-icons/eye-light.png"/>
<BitmapImage x:Key="QuickPanelChevronLeftIcon" UriSource="/Resources/new-icons/chevron-left-light.png"/>
<!-- 几何面板图标资源 -->
<BitmapImage x:Key="GeoIconLine" UriSource="/Resources/Icons-png/geo-icons/line_white.png"/>
<BitmapImage x:Key="GeoIconDashedLine" UriSource="/Resources/Icons-png/geo-icons/dashed-line_white.png"/>
<BitmapImage x:Key="GeoIconDotLine" UriSource="/Resources/Icons-png/geo-icons/dotted-line_white.png"/>
<BitmapImage x:Key="GeoIconArrow" UriSource="/Resources/Icons-png/geo-icons/arrow_white.png"/>
<BitmapImage x:Key="GeoIconParallelLine" UriSource="/Resources/Icons-png/geo-icons/paralle-lines_white.png"/>
<BitmapImage x:Key="GeoIconRectangleCenter" UriSource="/Resources/Icons-png/geo-icons/centered-square_white.png"/>
<BitmapImage x:Key="GeoIconCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle_white.png"/>
<BitmapImage x:Key="GeoIconDashedCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle-dashed_white.png"/>
<BitmapImage x:Key="GeoIconEllipseCenter" UriSource="/Resources/Icons-png/geo-icons/centered-oval_white.png"/>
<BitmapImage x:Key="GeoIconCuboid" UriSource="/Resources/Icons-png/geo-icons/cube_white.png"/>
<BitmapImage x:Key="GeoIconRectangle" UriSource="/Resources/Icons-png/geo-icons/square_white.png"/>
<BitmapImage x:Key="GeoIconCylinder" UriSource="/Resources/Icons-png/geo-icons/cylinder_white.png"/>
<BitmapImage x:Key="GeoIconCone" UriSource="/Resources/Icons-png/geo-icons/cone_white.png"/>
</ResourceDictionary>
Ink Canvas/Resources/Styles/Light.xaml
+16 -1
View File
@@ -44,7 +44,7 @@
<SolidColorBrush x:Key="HistoryWindowTextPrimaryBrush" Color="#1f2937"/>
<SolidColorBrush x:Key="HistoryWindowTextSecondaryBrush" Color="#6b7280"/>
<!-- 快速面板图标资源 - 浅色主题 -->
<!-- 快速面板图标资源 -->
<BitmapImage x:Key="QuickPanelPersonMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_person_money_24_regular.png"/>
<BitmapImage x:Key="QuickPanelPeopleMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_people_money_24_regular.png"/>
<BitmapImage x:Key="QuickPanelTimerIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_timer_24_regular.png"/>
@@ -52,4 +52,19 @@
<BitmapImage x:Key="QuickPanelEndSlideshowIcon" UriSource="/Resources/new-icons/end-slides-show.png"/>
<BitmapImage x:Key="QuickPanelEyeIcon" UriSource="/Resources/new-icons/eye.png"/>
<BitmapImage x:Key="QuickPanelChevronLeftIcon" UriSource="/Resources/new-icons/chevron-left.png"/>
<!-- 几何面板图标资源 -->
<BitmapImage x:Key="GeoIconLine" UriSource="/Resources/Icons-png/geo-icons/line.png"/>
<BitmapImage x:Key="GeoIconDashedLine" UriSource="/Resources/Icons-png/geo-icons/dashed-line.png"/>
<BitmapImage x:Key="GeoIconDotLine" UriSource="/Resources/Icons-png/geo-icons/dotted-line.png"/>
<BitmapImage x:Key="GeoIconArrow" UriSource="/Resources/Icons-png/geo-icons/arrow.png"/>
<BitmapImage x:Key="GeoIconParallelLine" UriSource="/Resources/Icons-png/geo-icons/paralle-lines.png"/>
<BitmapImage x:Key="GeoIconRectangleCenter" UriSource="/Resources/Icons-png/geo-icons/centered-square.png"/>
<BitmapImage x:Key="GeoIconCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle.png"/>
<BitmapImage x:Key="GeoIconDashedCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle-dashed.png"/>
<BitmapImage x:Key="GeoIconEllipseCenter" UriSource="/Resources/Icons-png/geo-icons/centered-oval.png"/>
<BitmapImage x:Key="GeoIconCuboid" UriSource="/Resources/Icons-png/geo-icons/cube.png"/>
<BitmapImage x:Key="GeoIconRectangle" UriSource="/Resources/Icons-png/geo-icons/square.png"/>
<BitmapImage x:Key="GeoIconCylinder" UriSource="/Resources/Icons-png/geo-icons/cylinder.png"/>
<BitmapImage x:Key="GeoIconCone" UriSource="/Resources/Icons-png/geo-icons/cone.png"/>
</ResourceDictionary>