Skip to content

fix:手掌擦#419

Merged
CJKmkp merged 1 commit intobetafrom
fix-PalmEraser
Apr 5, 2026
Merged

fix:手掌擦#419
CJKmkp merged 1 commit intobetafrom
fix-PalmEraser

Conversation

@CJKmkp
Copy link
Copy Markdown
Member

@CJKmkp CJKmkp commented Mar 28, 2026

No description provided.

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: df251b76ed

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +1002 to +1004
if (isPalmEraserActive)
{
isPalmEraserActive = false;
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Restore previous editing mode when palm erasing ends

When the last touch is released, this block only clears isPalmEraserActive and never restores inkCanvas.EditingMode from EraseByPoint. Because PreviewTouchDown now returns early whenever mode is EraseByPoint and isPalmEraserActive is false, touch input can get stuck after one palm-erase gesture (no further touch inking/gesture handling until another path changes the mode). Persist and restore the pre-palm mode (typically Ink) when deactivating palm eraser.

Useful? React with 👍 / 👎.

if (isPalmEraserActive)
{
isPalmEraserActive = false;
DisableEraserOverlay();
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Commit palm eraser history before disabling overlay

The palm-eraser teardown calls DisableEraserOverlay() directly, which skips the EraserOverlay_PointerUp path that commits ReplacedStroke/AddedStroke to timeMachine in MW_Eraser.cs. In sessions where palm erase actually removes strokes, those erases are not recorded as a discrete undo/redo operation, so undo behavior becomes inconsistent compared with normal eraser input.

Useful? React with 👍 / 👎.

@CJKmkp CJKmkp merged commit 0c078ef into beta Apr 5, 2026
1 check passed
@CJKmkp CJKmkp deleted the fix-PalmEraser branch April 5, 2026 12:43
CJKmkp added a commit that referenced this pull request Apr 5, 2026
* 1

* add:NewNewSettings

* add:NewNewSettings

* add:NewNewSettings

* 我服了

* 1

* 新新设置的第一个开关设置选项 开机时启动

* 更新 SettingsWindow2.xaml.cs

* add:高dpi适配 插件接口 设置窗口多显示器优化 fix:触摸后鼠标指针显示异常

* 更新 SettingsWindow2.xaml

* 更新 SettingsWindow2.xaml.cs

* Revert "更新 SettingsWindow2.xaml.cs"

This reverts commit ffdb3cd.

* Revert "更新 SettingsWindow2.xaml"

This reverts commit 5f9b01e.

* Revert "add:高dpi适配 插件接口 设置窗口多显示器优化 fix:触摸后鼠标指针显示异常"

This reverts commit ca53624.

* Update SettingsWindow.xaml.cs

* Reapply "add:高dpi适配 插件接口 设置窗口多显示器优化 fix:触摸后鼠标指针显示异常"

This reverts commit 26f79da.

* Reapply "更新 SettingsWindow2.xaml"

This reverts commit 11cb181.

* Reapply "更新 SettingsWindow2.xaml.cs"

This reverts commit a6fdb07.

* Update SettingsWindow2.xaml

* Update SettingsWindow2.xaml

* i18n

* Update SettingsWindow2.xaml.cs

* 新设置

* i18n

添加注释

* 新设置

* Update SettingsWindow2.xaml

* i1145141919810n

* i1145141919810n

* 新设置

* Revert "新设置"

This reverts commit 140e92e.

* Revert "新设置"

This reverts commit 140e92e.

* improve:手写体识别

* improve:手写体识别

* add:插件系统

* delete:插件系统

* 优化代码

* improve:仅PPT模式

* refactor: 替换任务栏图标库为 H.NotifyIcon (#425)

更新所有相关文件和引用,从 Hardcodet.Wpf.TaskbarNotification 迁移到 H.NotifyIcon
调整通知显示方式并添加 ForceCreate 调用确保图标正确显示

Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>

* add:临时窗口显示

* add:复制按钮

* 重命名和补回i18n

* 新设置

删除插件管理

* add:pdf插入

* add:pdf插入

* remove:旧的新设置

* add:pdf插入

* Update MainWindow.xaml

* add:pdf插入

* improve:UI

* add:pdf插入

* add:pdf插入

* add:pdf插入

* improve:pdf插入

* 代码优化

* Revert "improve:pdf插入"

This reverts commit bad05f7.

* improve:UI

* improve:pdf插入

* fix:手掌擦 (#419)

---------

Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
Co-authored-by: PrefacedCorg <129855423+PrefacedCorg@users.noreply.github.com>
Co-authored-by: PrefacedCorg <1876568293@qq.com>
Co-authored-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
CJKmkp added a commit that referenced this pull request Apr 5, 2026
* improve:pdf插入

* fix:手掌擦 (#419)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant