Skip to content

fix:设置窗口打开时无法与工具栏交互 在任务栏图标中的“退出收纳模式”无效#495

Open
Braydenccc wants to merge 4 commits into
InkCanvasForClass:net6from
Braydenccc:jby-setting-fix
Open

fix:设置窗口打开时无法与工具栏交互 在任务栏图标中的“退出收纳模式”无效#495
Braydenccc wants to merge 4 commits into
InkCanvasForClass:net6from
Braydenccc:jby-setting-fix

Conversation

@Braydenccc
Copy link
Copy Markdown
Contributor

@Braydenccc Braydenccc commented May 23, 2026

包括最小化时

Copilot AI review requested due to automatic review settings May 23, 2026 16:04
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates floating bar behavior to keep it visible under certain UI states and changes the settings window from modal to modeless.

Changes:

  • Adjust floating bar visibility decisions after margin animations (based on edge proximity / folded state).
  • Show the Settings window modeless (Show) instead of modal (ShowDialog).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +2158 to +2161
if (MarginFromEdge > 0)
ViewboxFloatingBar.Visibility = Visibility.Visible;
else if (!Topmost)
ViewboxFloatingBar.Visibility = Visibility.Hidden;
Comment on lines +2364 to +2366
if (!isFloatingBarFolded)
ViewboxFloatingBar.Visibility = Visibility.Visible;
else if (!Topmost) ViewboxFloatingBar.Visibility = Visibility.Hidden;
_settingsWindow.Topmost = this.Topmost;
_settingsWindow.Closed += (s, args) => _settingsWindow = null;
_settingsWindow.ShowDialog();
_settingsWindow.Show();
Comment thread .gitignore Outdated
@Braydenccc
Copy link
Copy Markdown
Contributor Author

提交时候似乎有部分修改交错分支了,经测试这个PR也修复了#496所述问题。

@Braydenccc Braydenccc changed the title fix:设置窗口打开时,无法与工具栏交互 fix:设置窗口打开时无法与工具栏交互 在任务栏图标中的“退出收纳模式”无效 May 24, 2026
@CJKmkp
Copy link
Copy Markdown
Member

CJKmkp commented May 24, 2026

提交时候似乎有部分修改交错分支了,经测试这个PR也修复了#496所述问题。

那请不要重复修复同一个问题

@Braydenccc
Copy link
Copy Markdown
Contributor Author

提交时候似乎有部分修改交错分支了,经测试这个PR也修复了#496所述问题。

那请不要重复修复同一个问题

没有重复,这几个PR混到一个分支里做的,之后拆分commit的时候拆错了(

@CJKmkp
Copy link
Copy Markdown
Member

CJKmkp commented May 25, 2026

请撤销有关.gitignore的修改

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.

4 participants