Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes #130

Merged
merged 33 commits into from
Jun 2, 2024
Merged

Bug fixes #130

merged 33 commits into from
Jun 2, 2024

Conversation

Raspberry-Monster
Copy link
Collaborator

No description provided.

NotYoojun and others added 11 commits December 27, 2023 17:08
Raspberry-Monster and others added 16 commits March 3, 2024 10:11
[Bug Fix] 修改检测触摸数逻辑
commit 8939eb1
Author: XY Wang <[email protected]>
Date:   Thu Mar 14 16:09:31 2024 +0800

    Update MainWindow.xaml.cs

commit b8b9e7a
Merge: f84a4f2 80c57dc
Author: XY Wang <[email protected]>
Date:   Thu Mar 14 16:06:29 2024 +0800

    Merge branch 'master' into master

commit f84a4f2
Author: STBBRD <[email protected]>
Date:   Sat Dec 23 20:51:22 2023 +0800

    解决 MainWindow.xaml 冲突

commit f0c44fe
Author: STBBRD <[email protected]>
Date:   Sat Dec 2 20:14:48 2023 +0800

    修复当使用橡皮时隐藏再显示画板导致显示浅色画笔的问题,恢复对关闭确认的修改

commit 7668ad3
Author: STBBRD <[email protected]>
Date:   Sat Nov 25 20:33:47 2023 +0800

    将第一个关闭警告修改为普通的 MessageBox,以防止 Windows 关机时出现警告音

commit 525cc8e
Author: STBBRD <[email protected]>
Date:   Sun Nov 19 12:27:31 2023 +0800

    修正 屏幕批注下按两次 Alt+E 变成浅色画笔 的问题

commit 01aad1f
Author: STBBRD <[email protected]>
Date:   Sun Nov 19 11:29:05 2023 +0800

    将贡献者中的 STBBRD(我) 改为 ZongziTEK(我)

commit 21d8a84
Merge: 228b687 c054e85
Author: ZongziTEK <[email protected]>
Date:   Sun Nov 19 11:17:31 2023 +0800

    Merge branch 'WXRIW:master' into master

commit 228b687
Author: STBBRD <[email protected]>
Date:   Sat Nov 4 20:09:32 2023 +0800

    做了读取画笔颜色配置文件时的错误处理

commit acc3a0c
Author: STBBRD <[email protected]>
Date:   Sun Oct 29 09:19:48 2023 +0800

    完成深浅色切换、根据配置文件自定义颜色功能

    - 修复了加载颜色的所有问题
    - 新增对更改颜色请求是否从浮动工具栏发出的判断

commit 02fa775
Author: STBBRD <[email protected]>
Date:   Sun Oct 29 08:44:37 2023 +0800

    修复昨天的问题

commit 51c6127
Author: STBBRD <[email protected]>
Date:   Sat Oct 28 22:53:04 2023 +0800

    初步适配了浮动工具栏UI中 黑板 屏幕批注 的画笔颜色模式切换,但是仍有问题

    问题:从黑板直接到屏幕批注时浅色画笔不会变成深色画笔

commit d7d3f02
Author: STBBRD <[email protected]>
Date:   Sat Oct 28 22:42:06 2023 +0800

    更正一个注释中的错别字

commit 5f06a07
Author: STBBRD <[email protected]>
Date:   Sat Oct 28 22:40:54 2023 +0800

    新增 加载两种画笔颜色模式的配置文件,并应用于 Old UI 深浅色切换
* 新增 加载两种画笔颜色模式的配置文件,并应用于 Old UI 深浅色切换

* 更正一个注释中的错别字

* 初步适配了浮动工具栏UI中 黑板 屏幕批注 的画笔颜色模式切换,但是仍有问题

问题:从黑板直接到屏幕批注时浅色画笔不会变成深色画笔

* 修复昨天的问题

* 完成深浅色切换、根据配置文件自定义颜色功能

- 修复了加载颜色的所有问题
- 新增对更改颜色请求是否从浮动工具栏发出的判断

* 做了读取画笔颜色配置文件时的错误处理

* 将贡献者中的 STBBRD(我) 改为 ZongziTEK(我)

* 修正 屏幕批注下按两次 Alt+E 变成浅色画笔 的问题

* 将第一个关闭警告修改为普通的 MessageBox,以防止 Windows 关机时出现警告音

* 修复当使用橡皮时隐藏再显示画板导致显示浅色画笔的问题,恢复对关闭确认的修改

* 解决 MainWindow.xaml 冲突

* Update MainWindow.xaml.cs

---------

Co-authored-by: XY Wang <[email protected]>
把画笔粗细调节栏移到扳手菜单
@Raspberry-Monster Raspberry-Monster merged commit 653bf51 into master Jun 2, 2024
2 checks passed
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.

6 participants