diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 8dc5b359..5ff02806 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -493,6 +493,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index e9512fcb..68132647 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -9578,7 +9578,7 @@
@@ -9592,7 +9592,7 @@
MouseUp="SymbolIconRandOne_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9600,7 +9600,7 @@
MouseUp="SymbolIconRand_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9608,7 +9608,7 @@
MouseUp="ImageCountdownTimer_MouseUp" Background="Transparent"
Orientation="Vertical" HorizontalAlignment="Center" Width="32" Margin="0">
-
@@ -9616,7 +9616,7 @@
MouseUp="ImageBlackboard_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9625,7 +9625,7 @@
MouseUp="ExitPPTSlideShow_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0" Visibility="Collapsed">
-
@@ -9634,7 +9634,7 @@
MouseUp="UnFoldFloatingBar_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9642,7 +9642,7 @@
MouseUp="HideQuickPanel_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9654,7 +9654,7 @@
@@ -9675,7 +9675,7 @@
MouseUp="SymbolIconRandOne_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9683,7 +9683,7 @@
MouseUp="SymbolIconRand_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9691,7 +9691,7 @@
MouseUp="ImageCountdownTimer_MouseUp" Background="Transparent"
Orientation="Vertical" HorizontalAlignment="Center" Width="32" Margin="0">
-
@@ -9699,7 +9699,7 @@
MouseUp="ImageBlackboard_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9708,7 +9708,7 @@
MouseUp="ExitPPTSlideShow_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0" Visibility="Collapsed">
-
@@ -9717,7 +9717,7 @@
MouseUp="UnFoldFloatingBar_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
@@ -9725,7 +9725,7 @@
MouseUp="HideQuickPanel_MouseUp"
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
Width="32" Margin="0">
-
diff --git a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
index 63949a51..a797d793 100644
--- a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
+++ b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
@@ -54,6 +54,9 @@ namespace Ink_Canvas
InitializeFloatBarForegroundColor();
+ // 刷新快速面板图标
+ RefreshQuickPanelIcons();
+
// 强制刷新UI
window.InvalidateVisual();
}
@@ -79,6 +82,9 @@ namespace Ink_Canvas
InitializeFloatBarForegroundColor();
+ // 刷新快速面板图标
+ RefreshQuickPanelIcons();
+
// 强制刷新UI
window.InvalidateVisual();
}
@@ -103,6 +109,35 @@ namespace Ink_Canvas
}
}
+ ///
+ /// 刷新快速面板图标
+ ///
+ private void RefreshQuickPanelIcons()
+ {
+ try
+ {
+ if (LeftUnFoldButtonQuickPanel != null)
+ {
+ LeftUnFoldButtonQuickPanel.InvalidateVisual();
+ }
+ if (RightUnFoldButtonQuickPanel != null)
+ {
+ RightUnFoldButtonQuickPanel.InvalidateVisual();
+ }
+ if (LeftSidePanel != null)
+ {
+ LeftSidePanel.InvalidateVisual();
+ }
+ if (RightSidePanel != null)
+ {
+ RightSidePanel.InvalidateVisual();
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+
///
/// 刷新浮动工具栏按钮颜色
///
diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_people_money_24_regular-light.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_people_money_24_regular-light.png
new file mode 100644
index 00000000..a4bdd0e7
Binary files /dev/null and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_people_money_24_regular-light.png differ
diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_person_money_24_regular-light.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_person_money_24_regular-light.png
new file mode 100644
index 00000000..62770437
Binary files /dev/null and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_person_money_24_regular-light.png differ
diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_timer_24_regular-light.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_timer_24_regular-light.png
new file mode 100644
index 00000000..36de1802
Binary files /dev/null and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_timer_24_regular-light.png differ
diff --git a/Ink Canvas/Resources/Styles/Dark.xaml b/Ink Canvas/Resources/Styles/Dark.xaml
index 3a5f14bb..004a6143 100644
--- a/Ink Canvas/Resources/Styles/Dark.xaml
+++ b/Ink Canvas/Resources/Styles/Dark.xaml
@@ -38,4 +38,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Ink Canvas/Resources/Styles/Light.xaml b/Ink Canvas/Resources/Styles/Light.xaml
index 00943f56..72389c2c 100644
--- a/Ink Canvas/Resources/Styles/Light.xaml
+++ b/Ink Canvas/Resources/Styles/Light.xaml
@@ -38,4 +38,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Ink Canvas/Resources/new-icons/blackboard-light.png b/Ink Canvas/Resources/new-icons/blackboard-light.png
new file mode 100644
index 00000000..c1bbcde6
Binary files /dev/null and b/Ink Canvas/Resources/new-icons/blackboard-light.png differ
diff --git a/Ink Canvas/Resources/new-icons/chevron-left-light.png b/Ink Canvas/Resources/new-icons/chevron-left-light.png
new file mode 100644
index 00000000..b83607dd
Binary files /dev/null and b/Ink Canvas/Resources/new-icons/chevron-left-light.png differ
diff --git a/Ink Canvas/Resources/new-icons/end-slides-show-light.png b/Ink Canvas/Resources/new-icons/end-slides-show-light.png
new file mode 100644
index 00000000..2b6f66d1
Binary files /dev/null and b/Ink Canvas/Resources/new-icons/end-slides-show-light.png differ
diff --git a/Ink Canvas/Resources/new-icons/eye-light.png b/Ink Canvas/Resources/new-icons/eye-light.png
new file mode 100644
index 00000000..803da68b
Binary files /dev/null and b/Ink Canvas/Resources/new-icons/eye-light.png differ