diff --git a/debian/control b/debian/control index 75d0564d8..38346512d 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,6 @@ Build-Depends: libqt6svg6, libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon, qt6-declarative-private-dev, libyaml-cpp-dev, - qtbase5-dev, qtbase5-private-dev, qtwayland5-dev-tools, qtwayland5-private-dev, libdtkgui-dev, libdtkwidget-dev, libdtkcore5-bin, qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (>= 0.0.11), dde-application-manager-api (>= 1.2.16), dde-control-center-dev (>= 6.0.73) Standards-Version: 3.9.8 diff --git a/frame/qml/PanelPopupWindow.qml b/frame/qml/PanelPopupWindow.qml index fdf7405c9..eb11e8872 100644 --- a/frame/qml/PanelPopupWindow.qml +++ b/frame/qml/PanelPopupWindow.qml @@ -124,10 +124,6 @@ Window { return appearance.opacity } blendColor: { - // TODO: when dtk support treeland blur, remove following - if (Qt.platform.pluginName === "wayland") - return "transparent" - if (valid) { return DStyle.Style.control.selectColor(undefined, Qt.rgba(235 / 255.0, 235 / 255.0, 235 / 255.0, blendColorAlpha(0.6)), diff --git a/panels/dock/dockhelper.cpp b/panels/dock/dockhelper.cpp index 9cf990f2c..44f843ba7 100644 --- a/panels/dock/dockhelper.cpp +++ b/panels/dock/dockhelper.cpp @@ -58,6 +58,11 @@ bool DockHelper::eventFilter(QObject *watched, QEvent *event) return false; } + // not dock panel or dock popup has a enter event + if (window != parent()->rootObject() && window->transientParent() != parent()->rootObject()) { + return false; + } + switch (event->type()) { case QEvent::Enter: { m_enters.insert(window, true);