From 46f4a0523c432bcf72609d6777efa04e34572f63 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 2 May 2026 01:17:09 +0800
Subject: [PATCH] =?UTF-8?q?improve:PPT=E4=BE=A7=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Windows/PPTQuickPanel.xaml | 369 +++++++++++++----------
Ink Canvas/Windows/PPTQuickPanel.xaml.cs | 70 ++---
2 files changed, 233 insertions(+), 206 deletions(-)
diff --git a/Ink Canvas/Windows/PPTQuickPanel.xaml b/Ink Canvas/Windows/PPTQuickPanel.xaml
index 6a7262ea..434e15a5 100644
--- a/Ink Canvas/Windows/PPTQuickPanel.xaml
+++ b/Ink Canvas/Windows/PPTQuickPanel.xaml
@@ -3,69 +3,127 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d"
- d:DesignHeight="400" d:DesignWidth="300">
+ d:DesignHeight="420" d:DesignWidth="260">
-
+
+ Storyboard.TargetProperty="X"
+ Duration="0:0:0.28">
-
-
+ Storyboard.TargetProperty="X"
+ Duration="0:0:0.28">
-
+
+
+
+
+
+
+
-
+
-
-
-
+
\ No newline at end of file
diff --git a/Ink Canvas/Windows/PPTQuickPanel.xaml.cs b/Ink Canvas/Windows/PPTQuickPanel.xaml.cs
index 2ea42ea9..7dfeee0e 100644
--- a/Ink Canvas/Windows/PPTQuickPanel.xaml.cs
+++ b/Ink Canvas/Windows/PPTQuickPanel.xaml.cs
@@ -747,31 +747,34 @@ namespace Ink_Canvas.Windows
private void ArrowButton_MouseEnter(object sender, MouseEventArgs e)
{
- // 根据当前主题设置悬停颜色
- bool isDark = ArrowButtonBackgroundBrush.Color.R < 128;
- if (isDark)
- {
- ArrowButtonBackgroundBrush.Color = Color.FromArgb(230, 32, 32, 32);
- }
- else
- {
- ArrowButtonBackgroundBrush.Color = Color.FromArgb(230, 255, 255, 255);
- }
+ ArrowButtonBackgroundBrush.Color = Color.FromArgb(220, 55, 55, 55);
}
private void ArrowButton_MouseLeave(object sender, MouseEventArgs e)
{
- // 恢复主题颜色
- ApplyTheme();
+ ArrowButtonBackgroundBrush.Color = Color.FromArgb(204, 31, 31, 31);
}
#endregion
#region 拖动手势
+ private static bool IsWithinSlider(object source)
+ {
+ var d = source as DependencyObject;
+ while (d != null)
+ {
+ if (d is Slider) return true;
+ d = (d is System.Windows.Media.Visual || d is System.Windows.Media.Media3D.Visual3D)
+ ? System.Windows.Media.VisualTreeHelper.GetParent(d)
+ : LogicalTreeHelper.GetParent(d);
+ }
+ return false;
+ }
+
private void ContentBorder_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
- if (e.OriginalSource is Slider) return; // 如果点击的是滑块，不处理拖动
+ if (IsWithinSlider(e.OriginalSource)) return;
_isDragging = true;
_dragStartPoint = e.GetPosition(MainCanvas);
@@ -816,7 +819,7 @@ namespace Ink_Canvas.Windows
private void ContentBorder_TouchDown(object sender, TouchEventArgs e)
{
- if (e.OriginalSource is Slider) return;
+ if (IsWithinSlider(e.OriginalSource)) return;
_isDragging = true;
_dragStartPoint = e.GetTouchPoint(MainCanvas).Position;
@@ -1835,35 +1838,16 @@ namespace Ink_Canvas.Windows
{
try
{
- bool isDarkTheme = settings.Appearance.Theme == 1 ||
- (settings.Appearance.Theme == 2 && !ThemeHelper.IsSystemThemeLight());
-
- if (isDarkTheme)
- {
- // 深色主题：使用80%不透明度的深色背景
- ArrowButtonBackgroundBrush.Color = Color.FromArgb(204, 32, 32, 32); // #CC202020
- ContentBackgroundBrush.Color = Color.FromArgb(204, 32, 32, 32); // #CC202020
- ArrowPathFillBrush.Color = Colors.White;
- VolumeIconFillBrush.Color = Colors.White;
- VolumeIconFillBrush2.Color = Colors.White;
- VolumeValueForegroundBrush.Color = Color.FromArgb(200, 255, 255, 255);
- MagnifierTitleForegroundBrush.Color = Colors.White;
- MagnifierDescForegroundBrush.Color = Color.FromArgb(200, 255, 255, 255);
- Separator1BackgroundBrush.Color = Color.FromArgb(128, 255, 255, 255);
- }
- else
- {
- // 浅色主题：使用80%不透明度的白色背景
- ArrowButtonBackgroundBrush.Color = Color.FromArgb(204, 255, 255, 255); // #CCFFFFFF
- ContentBackgroundBrush.Color = Color.FromArgb(204, 255, 255, 255); // #CCFFFFFF
- ArrowPathFillBrush.Color = Colors.Black;
- VolumeIconFillBrush.Color = Colors.Black;
- VolumeIconFillBrush2.Color = Colors.Black;
- VolumeValueForegroundBrush.Color = Color.FromArgb(128, 0, 0, 0);
- MagnifierTitleForegroundBrush.Color = Colors.Black;
- MagnifierDescForegroundBrush.Color = Color.FromArgb(128, 0, 0, 0);
- Separator1BackgroundBrush.Color = Color.FromArgb(255, 224, 224, 224);
- }
+ // Game Bar 风格：始终使用深色半透明外壳，不随系统主题翻转
+ ArrowButtonBackgroundBrush.Color = Color.FromArgb(204, 31, 31, 31);
+ ContentBackgroundBrush.Color = Color.FromArgb(204, 31, 31, 31); // #CC1F1F1F
+ ArrowPathFillBrush.Color = Colors.White;
+ VolumeIconFillBrush.Color = Colors.White;
+ VolumeIconFillBrush2.Color = Colors.White;
+ VolumeValueForegroundBrush.Color = Color.FromArgb(230, 255, 255, 255);
+ MagnifierTitleForegroundBrush.Color = Colors.White;
+ MagnifierDescForegroundBrush.Color = Color.FromArgb(200, 255, 255, 255);
+ Separator1BackgroundBrush.Color = Color.FromArgb(60, 255, 255, 255);
}
catch (Exception ex)
{