Skip to content

fix: Main interface does not gray out when losing focus #570

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.

Sign up for GitHub

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

Closed
JWWTSL wants to merge 2 commits into from
Closed

fix: Main interface does not gray out when losing focus #570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf74e47
fix: Main interface does not gray out when losing focus
JWWTSL Feb 7, 2026
f227bc4
Merge branch 'linuxdeepin:master' into master
JWWTSL Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions qt6/src/qml/DialogWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Window {
property real leftPadding: DS.Style.dialogWindow.contentHMargin
property real rightPadding: DS.Style.dialogWindow.contentHMargin

property var transientParentWindow: null
transientParent: transientParentWindow

Item {
id: content
palette: control.active ? D.DTK.palette : D.DTK.inactivePalette
Expand Down Expand Up @@ -60,6 +63,27 @@ Window {
}
}

Component.onCompleted: {
if (control.modality === Qt.WindowModal && !transientParentWindow)
transientParentWindow = Qt.application.activeWindow
}

onVisibleChanged: {
if (!control.visible)

@18202781743 18202781743 Feb 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

更新transientParentWindow的代码封装一下,逻辑在omCompleted和visibleChanged的时候应该是一样的,

return
if (control.modality !== Qt.WindowModal)
return
if (!transientParentWindow || transientParentWindow === control) {
var candidate = Qt.application.activeWindow
if (candidate && candidate !== control)
transientParentWindow = candidate
}
Qt.callLater(function () {
control.raise()
control.requestActivate()
})
Comment on lines +66 to +84

Copilot AI Feb 7, 2026

Copy link

Choose a reason for hiding this comment

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

transientParentWindow is only set when it is null (or equals control). Once it has been auto-assigned the first time, it will not update on subsequent shows. If a DialogWindow instance is reused across multiple top-level windows, the dialog can remain transient for the original window, causing the wrong window to gray out (or none) when shown from another active window. Consider recalculating the transient parent each time the dialog becomes visible (or clearing the auto-assigned parent when the dialog is hidden), while still respecting an explicitly provided transient parent when callers set one.

Copilot uses AI. Check for mistakes.
}

onClosing: function(close) {
// close can't reset sub control's hovered state. pms Bug:168405
// if we need to close, we can add closing handler to set `close.acceped = true`
Expand Down
Loading