From 163145274dd8b459207d85e9dab3ed140fcde8ed Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Tue, 4 Mar 2025 03:12:23 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/471 --- qt6/src/qml/ComboBox.qml | 1 + src/private/dquickbehindwindowblur.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qt6/src/qml/ComboBox.qml b/qt6/src/qml/ComboBox.qml index 4b895136..701479b0 100644 --- a/qt6/src/qml/ComboBox.qml +++ b/qt6/src/qml/ComboBox.qml @@ -156,6 +156,7 @@ T.ComboBox { } popup: Popup { + palette: control.palette implicitWidth: control.width contentItem: ArrowListView { clip: true diff --git a/src/private/dquickbehindwindowblur.cpp b/src/private/dquickbehindwindowblur.cpp index 09752450..9a65886b 100644 --- a/src/private/dquickbehindwindowblur.cpp +++ b/src/private/dquickbehindwindowblur.cpp @@ -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)