Skip to content

sync: from linuxdeepin/dtkdeclarative #241

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

Merged
18202781743 merged 1 commit into from
Mar 4, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions qt6/src/qml/ComboBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ T.ComboBox {
}

popup: Popup {
palette: control.palette
implicitWidth: control.width
contentItem: ArrowListView {
clip: true
Expand Down
2 changes: 1 addition & 1 deletion src/private/dquickbehindwindowblur.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void DSGBlendNode::render(const QSGRenderNode::RenderState *state)
{
// m_item may become invalid when the referred blur behind item get destroyed by a Loader.
// Give up rendering in this case.
if (!m_item)
if (!m_item || !m_item->window())
return;

if (m_isRestore)
Expand Down