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

fix:issue #178 #177

Browse Source
This commit is contained in:
CJKmkp
2025-09-07 00:11:22 +08:00
parent f22fd7b5d1
commit f67db9beed
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml.cs
+3 -3
View File
@@ -2416,7 +2416,7 @@ namespace Ink_Canvas
if (slider == null) return; if (slider == null) return;
// 捕获触摸设备 // 捕获触摸设备
if (e.RoutedEvent == UIElement.TouchDownEvent) if (e.RoutedEvent == TouchDownEvent)
{ {
slider.CaptureTouch(e.TouchDevice); slider.CaptureTouch(e.TouchDevice);
} }
@@ -2451,7 +2451,7 @@ namespace Ink_Canvas
if (slider == null) return; if (slider == null) return;
// 捕获手写笔设备 // 捕获手写笔设备
if (e.RoutedEvent == UIElement.StylusDownEvent) if (e.RoutedEvent == StylusDownEvent)
{ {
slider.CaptureStylus(); slider.CaptureStylus();
} }
@@ -2619,7 +2619,7 @@ namespace Ink_Canvas
{ {
try try
{ {
var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch; var toggle = sender as ToggleSwitch;
if (toggle != null) if (toggle != null)
{ {
Settings.ModeSettings.IsPPTOnlyMode = toggle.IsOn; Settings.ModeSettings.IsPPTOnlyMode = toggle.IsOn;
Ink Canvas/MainWindow_cs/MW_Eraser.cs
+8
View File
@@ -750,6 +750,10 @@ namespace Ink_Canvas
{ {
overlay.CaptureMouse(); overlay.CaptureMouse();
StartAdvancedEraserOperation(sender); StartAdvancedEraserOperation(sender);
// 处理单点擦除
var position = e.GetPosition((UIElement)FindName("inkCanvas"));
UpdateAdvancedEraserPosition(sender, position);
} }
}; };
@@ -787,6 +791,10 @@ namespace Ink_Canvas
overlay.CaptureStylus(); overlay.CaptureStylus();
} }
StartAdvancedEraserOperation(sender); StartAdvancedEraserOperation(sender);
// 处理单点擦除
var position = e.GetPosition((UIElement)FindName("inkCanvas"));
UpdateAdvancedEraserPosition(sender, position);
} }
}; };
Ink Canvas/MainWindow_cs/MW_PPT.cs
+2 -2
View File
@@ -232,10 +232,10 @@ namespace Ink_Canvas
pptApplication = new Microsoft.Office.Interop.PowerPoint.Application(); pptApplication = new Microsoft.Office.Interop.PowerPoint.Application();
// 设置为不可见，作为后台进程 // 设置为不可见，作为后台进程
pptApplication.Visible = Microsoft.Office.Core.MsoTriState.msoFalse; pptApplication.Visible = MsoTriState.msoFalse;
// 设置应用程序属性 // 设置应用程序属性
pptApplication.WindowState = Microsoft.Office.Interop.PowerPoint.PpWindowState.ppWindowMinimized; pptApplication.WindowState = PpWindowState.ppWindowMinimized;
// 直接设置PPTManager的PPTApplication属性，绕过COM注册问题 // 直接设置PPTManager的PPTApplication属性，绕过COM注册问题
Task.Delay(1000).ContinueWith(_ => Task.Delay(1000).ContinueWith(_ =>
Ink Canvas/Windows/HotkeySettingsWindow.xaml.cs
+3 -3
View File
@@ -66,10 +66,10 @@ namespace Ink_Canvas.Windows
try try
{ {
// 设置窗口启动位置为屏幕中心 // 设置窗口启动位置为屏幕中心
this.WindowStartupLocation = WindowStartupLocation.CenterScreen; WindowStartupLocation = WindowStartupLocation.CenterScreen;
// 确保窗口在显示时获得焦点 // 确保窗口在显示时获得焦点
this.ShowInTaskbar = true; ShowInTaskbar = true;
LogHelper.WriteLogToFile("快捷键设置窗口属性已设置"); LogHelper.WriteLogToFile("快捷键设置窗口属性已设置");
} }
@@ -540,7 +540,7 @@ namespace Ink_Canvas.Windows
/// <summary> /// <summary>
/// 标题栏拖拽事件 /// 标题栏拖拽事件
/// </summary> /// </summary>
private void TitleBar_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e) private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
if (e.ClickCount == 2) if (e.ClickCount == 2)
{ {
Ink Canvas/Windows/RandWindow.xaml.cs
+2 -2
View File
@@ -121,7 +121,7 @@ namespace Ink_Canvas
if (RandMaxPeopleOneTime != -1 && TotalCount >= RandMaxPeopleOneTime) return; if (RandMaxPeopleOneTime != -1 && TotalCount >= RandMaxPeopleOneTime) return;
TotalCount++; TotalCount++;
LabelNumberCount.Text = TotalCount.ToString(); LabelNumberCount.Text = TotalCount.ToString();
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.People; SymbolIconStart.Symbol = Symbol.People;
BorderBtnAdd.Opacity = 1; BorderBtnAdd.Opacity = 1;
BorderBtnMinus.Opacity = 1; BorderBtnMinus.Opacity = 1;
} }
@@ -133,7 +133,7 @@ namespace Ink_Canvas
LabelNumberCount.Text = TotalCount.ToString(); LabelNumberCount.Text = TotalCount.ToString();
if (TotalCount == 1) if (TotalCount == 1)
{ {
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Contact; SymbolIconStart.Symbol = Symbol.Contact;
} }
} }
Ink Canvas/Windows/SettingsViews/SettingsViews/AboutPanel.xaml.cs
+5 -5
View File
@@ -43,7 +43,7 @@ namespace Ink_Canvas.Windows.SettingsViews {
} }
// 关于页面构建时间 // 关于页面构建时间
var buildTime = FileBuildTimeHelper.GetBuildDateTime(System.Reflection.Assembly.GetExecutingAssembly()); var buildTime = FileBuildTimeHelper.GetBuildDateTime(Assembly.GetExecutingAssembly());
if (buildTime != null) { if (buildTime != null) {
var bt = ((DateTimeOffset)buildTime).LocalDateTime; var bt = ((DateTimeOffset)buildTime).LocalDateTime;
var m = bt.Month.ToString().PadLeft(2, '0'); var m = bt.Month.ToString().PadLeft(2, '0');
@@ -69,7 +69,7 @@ namespace Ink_Canvas.Windows.SettingsViews {
} }
public static class TouchTabletDetectHelper { public static class TouchTabletDetectHelper {
[System.Runtime.InteropServices.DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern int GetSystemMetrics(int nIndex); public static extern int GetSystemMetrics(int nIndex);
public static bool IsTouchEnabled() public static bool IsTouchEnabled()
@@ -84,9 +84,9 @@ namespace Ink_Canvas.Windows.SettingsViews {
{ {
public USBDeviceInfo(string deviceID, string pnpDeviceID, string description) public USBDeviceInfo(string deviceID, string pnpDeviceID, string description)
{ {
this.DeviceID = deviceID; DeviceID = deviceID;
this.PnpDeviceID = pnpDeviceID; PnpDeviceID = pnpDeviceID;
this.Description = description; Description = description;
} }
public string DeviceID { get; private set; } public string DeviceID { get; private set; }
public string PnpDeviceID { get; private set; } public string PnpDeviceID { get; private set; }
Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs
+5 -5
View File
@@ -237,14 +237,14 @@ namespace Ink_Canvas.Windows {
public ImageSource IconSource { get; set; } public ImageSource IconSource { get; set; }
public bool Selected { get; set; } public bool Selected { get; set; }
public Visibility _spVisibility { public Visibility _spVisibility {
get => this.Type == SidebarItemType.Separator ? Visibility.Visible : Visibility.Collapsed; get => Type == SidebarItemType.Separator ? Visibility.Visible : Visibility.Collapsed;
} }
public Visibility _siVisibility { public Visibility _siVisibility {
get => this.Type == SidebarItemType.Item ? Visibility.Visible : Visibility.Collapsed; get => Type == SidebarItemType.Item ? Visibility.Visible : Visibility.Collapsed;
} }
public SolidColorBrush _siBackground { public SolidColorBrush _siBackground {
get => this.Selected get => Selected
? new SolidColorBrush(Color.FromRgb(217, 217, 217)) ? new SolidColorBrush(Color.FromRgb(217, 217, 217))
: new SolidColorBrush(Colors.Transparent); : new SolidColorBrush(Colors.Transparent);
} }
@@ -622,7 +622,7 @@ namespace Ink_Canvas.Windows {
catch (Exception ex) catch (Exception ex)
{ {
// 记录错误但不影响程序运行 // 记录错误但不影响程序运行
System.Diagnostics.Debug.WriteLine($"添加自定义滑块触摸支持时出错: {ex.Message}"); Debug.WriteLine($"添加自定义滑块触摸支持时出错: {ex.Message}");
} }
} }
@@ -930,7 +930,7 @@ namespace Ink_Canvas.Windows {
} }
catch (Exception ex) catch (Exception ex)
{ {
System.Diagnostics.Debug.WriteLine($"更新自定义滑块值时出错: {ex.Message}"); Debug.WriteLine($"更新自定义滑块值时出错: {ex.Message}");
} }
} }