From 83eba826ef322e1676481bd38dbff747af4763cf Mon Sep 17 00:00:00 2001 From: tsic404 Date: Thu, 21 Nov 2024 13:44:53 +0800 Subject: [PATCH 1/3] fix: mouse enter desktop make dock not hide log: as title --- panels/dock/dockhelper.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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); From 4cb1e182cc7f065893edcdb972830b95ed0f28db Mon Sep 17 00:00:00 2001 From: tsic404 Date: Thu, 21 Nov 2024 13:45:56 +0800 Subject: [PATCH 2/3] fix: dock not transparent on treeland log: as title --- panels/dock/package/main.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/panels/dock/package/main.qml b/panels/dock/package/main.qml index 12f925f7e..df431b09e 100644 --- a/panels/dock/package/main.qml +++ b/panels/dock/package/main.qml @@ -84,6 +84,10 @@ Window { anchors.fill: parent cornerRadius: 0 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, dock.blendColorAlpha(0.6)), From b5972e272bb4cbec7b1fa961552d5b6d90c5c014 Mon Sep 17 00:00:00 2001 From: tsic404 Date: Thu, 21 Nov 2024 13:46:35 +0800 Subject: [PATCH 3/3] chore: remove qt5 depends log: as title --- debian/control | 1 - frame/qml/PanelPopupWindow.qml | 4 ---- panels/dock/package/main.qml | 4 ---- 3 files changed, 9 deletions(-) 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/package/main.qml b/panels/dock/package/main.qml index df431b09e..12f925f7e 100644 --- a/panels/dock/package/main.qml +++ b/panels/dock/package/main.qml @@ -84,10 +84,6 @@ Window { anchors.fill: parent cornerRadius: 0 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, dock.blendColorAlpha(0.6)),