diff --git a/debian/control b/debian/control index 37a5f8b1c..72d10c14c 100644 --- a/debian/control +++ b/debian/control @@ -66,8 +66,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libdtk6declarative( =${binary:Version}), libdtk6core-dev, - libdtk6gui-dev, - libdtkcommon-dev, + libdtk6gui-dev (>> 6.7.42), + libdtkcommon-dev (>> 6.7.42), qt6-base-dev, qt6-declarative-dev Build-Profiles: @@ -119,8 +119,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkdeclarative5( =${binary:Version}), libdtkcore-dev, - libdtkgui-dev, - libdtkcommon-dev, + libdtkgui-dev (>> 5.7.42), + libdtkcommon-dev (>> 5.7.42), qtbase5-dev, qtdeclarative5-dev Build-Profiles: diff --git a/qt6/src/qml/overridable/InWindowBlur.qml b/qt6/src/qml/overridable/InWindowBlur.qml index fbadcce52..a6eab580a 100644 --- a/qt6/src/qml/overridable/InWindowBlur.qml +++ b/qt6/src/qml/overridable/InWindowBlur.qml @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later @@ -18,7 +18,7 @@ Item { D.BackdropBlitter { id: blitter anchors.fill: parent - blitterEnabled: !D.DTK.isSoftwareRender + blitterEnabled: !D.DTK.isSoftwareRender && D.DTK.hasInWindowBlur MultiEffect { id: blur diff --git a/src/private/dqmlglobalobject.cpp b/src/private/dqmlglobalobject.cpp index 8ea840fac..3dff8ddaa 100644 --- a/src/private/dqmlglobalobject.cpp +++ b/src/private/dqmlglobalobject.cpp @@ -221,6 +221,11 @@ bool DQMLGlobalObject::hasAnimation() return DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::HasAnimations); } +bool DQMLGlobalObject::hasInWindowBlur() +{ + return DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::HasInWindowBlur); +} + bool DQMLGlobalObject::isSoftwareRender() { static bool isSoftware = QQuickWindow::sceneGraphBackend() == QLatin1String("software"); diff --git a/src/private/dqmlglobalobject_p.h b/src/private/dqmlglobalobject_p.h index b40f92e88..e2d24d55b 100644 --- a/src/private/dqmlglobalobject_p.h +++ b/src/private/dqmlglobalobject_p.h @@ -120,6 +120,7 @@ class DQMLGlobalObject : public QObject, public DTK_CORE_NAMESPACE::DObject Q_PROPERTY(bool hasComposite READ hasComposite NOTIFY hasCompositeChanged) Q_PROPERTY(bool hasNoTitlebar READ hasNoTitlebar NOTIFY hasNoTitlebarChanged) Q_PROPERTY(bool hasAnimation READ hasAnimation NOTIFY hasAnimationChanged) + Q_PROPERTY(bool hasInWindowBlur READ hasInWindowBlur NOTIFY hasInWindowBlurChanged) Q_PROPERTY(bool isSoftwareRender READ isSoftwareRender FINAL CONSTANT) Q_PROPERTY(DTK_GUI_NAMESPACE::DWindowManagerHelper::WMName windowManagerName READ windowManagerName CONSTANT) Q_PROPERTY(DTK_GUI_NAMESPACE::DGuiApplicationHelper::ColorType themeType READ themeType NOTIFY themeTypeChanged) @@ -185,6 +186,7 @@ class DQMLGlobalObject : public QObject, public DTK_CORE_NAMESPACE::DObject bool hasComposite() const; bool hasNoTitlebar() const; static bool hasAnimation(); + static bool hasInWindowBlur(); static bool isSoftwareRender(); DWindowManagerHelper::WMName windowManagerName() const; @@ -252,6 +254,7 @@ class DQMLGlobalObject : public QObject, public DTK_CORE_NAMESPACE::DObject void hasCompositeChanged(); void hasNoTitlebarChanged(); void hasAnimationChanged(); + void hasInWindowBlurChanged(); void paletteChanged(); void inactivePaletteChanged(); void themeTypeChanged(DTK_GUI_NAMESPACE::DGuiApplicationHelper::ColorType themeType);