diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index 87ad016a..653a1e51 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -624,6 +624,13 @@ + + + + + + + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 0a2bf4b9..9304e290 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -3874,7 +3874,7 @@ CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionClone_MouseUp"> - @@ -3886,7 +3886,7 @@ MouseUp="BorderStrokeSelectionCloneToNewBoard_MouseUp" Visibility="{Binding Visibility, ElementName=GridBackgroundCover}"> - @@ -3914,10 +3914,10 @@ - - - - + /// 刷新墨迹选中栏图标 + /// + private void RefreshStrokeSelectionIcons() + { + try + { + if (BorderStrokeSelectionControl != null) + { + // 强制刷新墨迹选中栏的视觉状态 + BorderStrokeSelectionControl.InvalidateVisual(); + + // 刷新墨迹选中栏内的所有图标 + var viewbox = BorderStrokeSelectionControl.Child as Viewbox; + if (viewbox?.Child is ui.SimpleStackPanel stackPanel) + { + RefreshStrokeSelectionIconsRecursive(stackPanel); + } + } + } + catch (Exception) + { + // 忽略异常,确保主题切换不会因为图标刷新失败而中断 + } + } + + /// + /// 递归刷新墨迹选中栏内的图标 + /// + private void RefreshStrokeSelectionIconsRecursive(System.Windows.Controls.Panel panel) + { + try + { + foreach (var child in panel.Children) + { + if (child is Image image) + { + // 强制刷新图像 + image.InvalidateVisual(); + } + else if (child is System.Windows.Controls.Panel childPanel) + { + // 递归处理子面板 + RefreshStrokeSelectionIconsRecursive(childPanel); + } + else if (child is Border border && border.Child is System.Windows.Controls.Panel borderPanel) + { + // 处理Border内的面板 + RefreshStrokeSelectionIconsRecursive(borderPanel); + } + } + } + catch (Exception) + { + // 忽略异常 + } + } } } \ No newline at end of file diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular_white.png index a2520c5f..cdf34c24 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular.png deleted file mode 100644 index 1e81d1f8..00000000 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular.png and /dev/null differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular_white.png deleted file mode 100644 index 57cc8453..00000000 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular_white.png and /dev/null differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_calendar_sync_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_calendar_sync_24_regular_white.png index cdf34c24..57cc8453 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_calendar_sync_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_calendar_sync_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dark_theme_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dark_theme_24_regular_white.png index 3ab5a9b6..31fb9005 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dark_theme_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dark_theme_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_delete_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_delete_24_regular_white.png index 5116fc4f..3ab5a9b6 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_delete_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_delete_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dismiss_circle_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dismiss_circle_24_regular_white.png index d8ebfe7d..fbac73f5 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dismiss_circle_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dismiss_circle_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_drag_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_drag_24_regular_white.png index b9825dc3..5116fc4f 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_drag_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_drag_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dual_screen_span_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dual_screen_span_24_regular_white.png index d0b88c45..d8ebfe7d 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dual_screen_span_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_dual_screen_span_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_edit_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_edit_24_regular_white.png index c30d506b..b9825dc3 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_edit_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_edit_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_horizontal_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_horizontal_24_regular_white.png index 680809e7..d0b88c45 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_horizontal_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_horizontal_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_keyboard_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_vertical_24_regular_white (2).png similarity index 100% rename from Ink Canvas/Resources/Icons-Fluent/ic_fluent_keyboard_24_regular_white.png rename to Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_vertical_24_regular_white (2).png diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_vertical_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_vertical_24_regular_white.png deleted file mode 100644 index 31fb9005..00000000 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_flip_vertical_24_regular_white.png and /dev/null differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular_white (2).png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular_white (2).png new file mode 100644 index 00000000..c30d506b Binary files /dev/null and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular_white (2).png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular_white.png deleted file mode 100644 index fbac73f5..00000000 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular_white.png and /dev/null differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_keyboard_24_regular_white (2).png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_keyboard_24_regular_white (2).png new file mode 100644 index 00000000..ea935c64 Binary files /dev/null and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_keyboard_24_regular_white (2).png differ diff --git a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_lasso_24_regular_white.png b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_lasso_24_regular_white.png index ea935c64..680809e7 100644 Binary files a/Ink Canvas/Resources/Icons-Fluent/ic_fluent_lasso_24_regular_white.png and b/Ink Canvas/Resources/Icons-Fluent/ic_fluent_lasso_24_regular_white.png differ diff --git a/Ink Canvas/Resources/Styles/Dark.xaml b/Ink Canvas/Resources/Styles/Dark.xaml index 5bfa83e2..a6be59a2 100644 --- a/Ink Canvas/Resources/Styles/Dark.xaml +++ b/Ink Canvas/Resources/Styles/Dark.xaml @@ -48,6 +48,15 @@ + + + + + + + + + diff --git a/Ink Canvas/Resources/Styles/Light.xaml b/Ink Canvas/Resources/Styles/Light.xaml index 61d16a7a..f9d66cfb 100644 --- a/Ink Canvas/Resources/Styles/Light.xaml +++ b/Ink Canvas/Resources/Styles/Light.xaml @@ -48,6 +48,15 @@ + + + + + + + + + diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index 57d842b8..c8c2dfbd 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache differ