diff --git a/frame/qml/PanelToolTip.qml b/frame/qml/PanelToolTip.qml index f4258339b..e63ccc0f0 100644 --- a/frame/qml/PanelToolTip.qml +++ b/frame/qml/PanelToolTip.qml @@ -4,9 +4,9 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 +import QtQuick.Window 2.15 import org.deepin.ds 1.0 import org.deepin.dtk 1.0 -import org.deepin.dtk.style as DStyle Item { id: control @@ -17,7 +17,7 @@ Item { property var toolTipWindow: Panel.toolTipWindow property int toolTipX: 0 property int toolTipY: 0 - property bool readyBinding: false + readonly property bool readyBinding: !!toolTipWindow && toolTipWindow.currentItem === control property bool openPending: false // WM_NAME, used for kwin. property string windowTitle: "dde-shell/paneltooltip" @@ -50,37 +50,16 @@ Item { if (!toolTipWindow) return - if (toolTipWindow.visible) { - toolTipWindow.close() - toolTipWindow.currentItem = null - Qt.callLater(function () { - if (!toolTip.visible) { - control.open() - } - }) - return - } - - readyBinding = Qt.binding(function () { - return toolTipWindow && toolTipWindow.currentItem === control - }) - + if (toolTipWindow.currentItem) + toolTipWindow.currentItem.close() toolTipWindow.currentItem = control openPending = true - Qt.callLater(function () { - if (!toolTipWindow || !openPending || !readyBinding || toolTipWindow.currentItem !== control) - return - - toolTipWindow.requestUpdateGeometry() - }) + toolTipWindow.requestUpdateGeometry() } function close() { openPending = false - if (!toolTipWindow) - return - if (!readyBinding) return @@ -103,6 +82,20 @@ Item { toolTipWindow.show() } + onVisibleChanged: { + if (!visible) + close() + } + Component.onDestruction: close() + + Connections { + target: control.Window.window + function onVisibleChanged() { + if (!target.visible) + control.close() + } + } + Connections { target: toolTipWindow function onUpdateGeometryFinished() @@ -115,7 +108,7 @@ Item { id: toolTip visible: readyBinding anchors.centerIn: parent - parent: toolTipWindow ? toolTipWindow.contentItem : control + parent: readyBinding ? toolTipWindow.contentItem : control font { family: DTK.fontManager.t8.family pixelSize: DTK.fontManager.t8.pixelSize diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt index f312cfe96..961655389 100644 --- a/panels/dock/CMakeLists.txt +++ b/panels/dock/CMakeLists.txt @@ -9,7 +9,7 @@ configure_file(environments.h.in environments.h @ONLY) find_package(PkgConfig REQUIRED) find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Core DBus Gui Qml WaylandCompositor Widgets WaylandClient) find_package(DdeTrayLoader REQUIRED) -find_package(TreelandProtocols 0.7.0 REQUIRED) +find_package(TreelandProtocols 0.9.0 REQUIRED) pkg_check_modules(WaylandClient REQUIRED IMPORTED_TARGET wayland-client) file( @@ -63,6 +63,7 @@ qt_generate_wayland_protocol_client_sources(dockpanel NO_INCLUDE_CORE_ONLY FILES ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-wallpaper-color-v1.xml + ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-foreign-toplevel-manager-unstable-v3.xml ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-xwindow-control-unstable-v1.xml ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-region-watch-unstable-v1.xml ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-layer-shell-extension-unstable-v1.xml diff --git a/panels/dock/dockhelper.h b/panels/dock/dockhelper.h index 0f2f50d12..aa2ac53ec 100644 --- a/panels/dock/dockhelper.h +++ b/panels/dock/dockhelper.h @@ -22,6 +22,8 @@ class DockHelper : public QObject void enterScreen(QScreen *screen); void leaveScreen(); + + virtual QObject *dockPreviewContext(QWindow *anchor) { return nullptr; } // Move XEmbed window relative to anchor window's surface (no-op on X11) virtual bool moveXEmbedWindow(uint32_t wid, double dx, double dy, QQuickWindow *anchorWindow = nullptr) { return false; } diff --git a/panels/dock/dockpanel.cpp b/panels/dock/dockpanel.cpp index 7fa36afcf..2049c6a15 100644 --- a/panels/dock/dockpanel.cpp +++ b/panels/dock/dockpanel.cpp @@ -439,6 +439,11 @@ bool DockPanel::debugMode() const #endif } +QObject *DockPanel::dockPreviewContext(QObject *anchor) +{ + return m_helper ? m_helper->dockPreviewContext(qobject_cast(anchor)) : nullptr; +} + void DockPanel::openDockSettings() { qCDebug(dockLog) << "openDockSettings"; diff --git a/panels/dock/dockpanel.h b/panels/dock/dockpanel.h index a10541b91..1176f998b 100644 --- a/panels/dock/dockpanel.h +++ b/panels/dock/dockpanel.h @@ -98,6 +98,9 @@ class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext Q_INVOKABLE void openDockSettings(); + // All dock applets share the panel's Wayland tooltip/preview context. + Q_INVOKABLE QObject *dockPreviewContext(QObject *anchor); + Q_INVOKABLE void notifyDockPositionChanged(int offsetX, int offsetY); // Move XEmbed window relative to anchor window's surface (Wayland only) @@ -183,7 +186,7 @@ private Q_SLOTS: QPointF m_cursorPosition; ColorTheme m_theme; HideState m_hideState; - DockHelper* m_helper; + DockHelper* m_helper = nullptr; QPointer m_dockScreen; bool m_compositorReady; bool m_launcherShown; diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp index 4e8e3c0c2..014a71c7d 100644 --- a/panels/dock/taskmanager/taskmanager.cpp +++ b/panels/dock/taskmanager/taskmanager.cpp @@ -165,7 +165,7 @@ bool TaskManager::load() { auto platformName = QGuiApplication::platformName(); if (QStringLiteral("wayland") == platformName) { - m_windowMonitor.reset(new TreeLandWindowMonitor()); + m_windowMonitor.reset(new TreeLandWindowMonitor(parentApplet())); } #ifdef BUILD_WITH_X11 diff --git a/panels/dock/taskmanager/treelandwindowmonitor.cpp b/panels/dock/taskmanager/treelandwindowmonitor.cpp index 0392ece95..704996623 100644 --- a/panels/dock/taskmanager/treelandwindowmonitor.cpp +++ b/panels/dock/taskmanager/treelandwindowmonitor.cpp @@ -9,13 +9,14 @@ #include "taskmanager.h" #include "treelandwindow.h" -#include +#include + #include +#include #include -#include - #include +#include namespace dock { ForeignToplevelManager::ForeignToplevelManager(TreeLandWindowMonitor* monitor) @@ -30,58 +31,16 @@ void ForeignToplevelManager::treeland_foreign_toplevel_manager_v3_toplevel(struc connect(handle, &ForeignToplevelHandle::handlerIsReady, m_monitor, &TreeLandWindowMonitor::handleForeignToplevelHandleAdded, Qt::UniqueConnection); } -TreeLandDockPreviewContext::TreeLandDockPreviewContext(struct ::treeland_dock_preview_context_v3 *context) - : QWaylandClientExtensionTemplate(1) - , m_isPreviewEntered(false) - , m_isDockMouseAreaEnter(false) - , m_hideTimer(new QTimer(this)) -{ - init(context); - - m_hideTimer->setSingleShot(true); - m_hideTimer->setInterval(800); - - connect(m_hideTimer, &QTimer::timeout, this, [this](){ - if (!m_isDockMouseAreaEnter && !m_isPreviewEntered) { - emit closed(); - close(); - } - }, Qt::QueuedConnection); -} - -TreeLandDockPreviewContext::~TreeLandDockPreviewContext() -{ - if (isInitialized()) - destroy(); -} - -void TreeLandDockPreviewContext::showWindowsPreview(QByteArray windowsId, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction) -{ - m_isDockMouseAreaEnter = true; - show(windowsId, previewXoffset, previewYoffset, direction); -} - -void TreeLandDockPreviewContext::hideWindowsPreview() -{ - m_isDockMouseAreaEnter = false; - m_hideTimer->start(); -} - -void TreeLandDockPreviewContext::treeland_dock_preview_context_v3_enter() -{ - m_isPreviewEntered = true; -} - -void TreeLandDockPreviewContext::treeland_dock_preview_context_v3_leave() +TreeLandWindowMonitor::TreeLandWindowMonitor(QObject *panel, QObject *parent) + :AbstractWindowMonitor(parent) + , m_panel(panel) + , m_fullscreenState(false) { - m_isPreviewEntered = false; - m_hideTimer->start(); } -TreeLandWindowMonitor::TreeLandWindowMonitor(QObject* parent) - :AbstractWindowMonitor(parent) - , m_fullscreenState(false) +TreeLandWindowMonitor::~TreeLandWindowMonitor() { + releaseDockPreviewContext(); } void TreeLandWindowMonitor::start() @@ -97,15 +56,15 @@ void TreeLandWindowMonitor::start() void TreeLandWindowMonitor::stop() { + releaseDockPreviewContext(); m_foreignToplevelManager.reset(nullptr); } - void TreeLandWindowMonitor::clear() { clearTrackedWindows(); m_windows.clear(); - m_dockPreview.reset(nullptr); + releaseDockPreviewContext(); updateFullscreenState(); } @@ -121,9 +80,33 @@ void TreeLandWindowMonitor::presentWindows(QList windows) void TreeLandWindowMonitor::hideItemPreview() { - if (m_dockPreview.isNull()) + if (m_dockPreview) + QMetaObject::invokeMethod(m_dockPreview, "hideWindowsPreview", Qt::DirectConnection); +} + +void TreeLandWindowMonitor::ensureDockPreviewContext(QWindow *anchor) +{ + QObject *context = nullptr; + if (m_panel) + QMetaObject::invokeMethod(m_panel, "dockPreviewContext", Qt::DirectConnection, + Q_RETURN_ARG(QObject *, context), Q_ARG(QObject *, anchor)); + if (m_dockPreview == context) + return; + + releaseDockPreviewContext(); + if (!context) return; - m_dockPreview->hideWindowsPreview(); + m_dockPreview = context; + connect(context, SIGNAL(closed()), this, SIGNAL(previewShouldClear())); + connect(context, &QObject::destroyed, this, &TreeLandWindowMonitor::previewShouldClear); +} + +void TreeLandWindowMonitor::releaseDockPreviewContext() +{ + hideItemPreview(); + if (m_dockPreview) + disconnect(m_dockPreview, nullptr, this, nullptr); + m_dockPreview.clear(); } void TreeLandWindowMonitor::requestPreview(QAbstractItemModel *sourceModel, @@ -132,47 +115,30 @@ void TreeLandWindowMonitor::requestPreview(QAbstractItemModel *sourceModel, int32_t previewYoffset, uint32_t direction) { - if (!m_foreignToplevelManager->isActive()) { + if (!sourceModel || !m_foreignToplevelManager || !m_foreignToplevelManager->isActive()) { return; } - if (m_dockPreview.isNull()) { - auto window = relativePositionItem; - if (!window) return; - auto waylandWindow = dynamic_cast(window->handle()); - if (!waylandWindow) return; - - auto context = m_foreignToplevelManager->get_dock_preview_context(waylandWindow->wlSurface()); - m_dockPreview.reset(new TreeLandDockPreviewContext(context)); - connect(window, &QWindow::visibleChanged, m_dockPreview.get(), [this]() { - m_dockPreview.reset(); - }); - connect(m_dockPreview.get(), &TreeLandDockPreviewContext::closed, this, [this]() { - // 当预览关闭时,发出信号清空过滤状态 - emit previewShouldClear(); - }); + QVarLengthArray array; + for (int i = 0; i < sourceModel->rowCount(); ++i) { + QModelIndex index = sourceModel->index(i, 0); + uint32_t winId = index.data(TaskManager::WinIdRole).toUInt(); + if (winId != 0) { + array.append(winId); + } } - m_dockPreview->m_isDockMouseAreaEnter = true; + if (array.isEmpty()) + return; - if (sourceModel && sourceModel->rowCount() > 0) { - QVarLengthArray array; - for (int i = 0; i < sourceModel->rowCount(); ++i) { - QModelIndex index = sourceModel->index(i, 0); - uint32_t winId = index.data(TaskManager::WinIdRole).toUInt(); - if (winId != 0) { - array.append(winId); - } - } + ensureDockPreviewContext(relativePositionItem); + if (!m_dockPreview) + return; - if (!array.isEmpty()) { - QByteArray byteArray; - int size = array.size() * sizeof(uint32_t); - byteArray.resize(size); - memcpy(byteArray.data(), array.constData(), size); - m_dockPreview->showWindowsPreview(byteArray, previewXoffset, previewYoffset, direction); - } - } + const QByteArray windows(reinterpret_cast(array.constData()), array.size() * sizeof(uint32_t)); + QMetaObject::invokeMethod(m_dockPreview, "showWindowsPreview", Qt::DirectConnection, + Q_ARG(QByteArray, windows), Q_ARG(int, previewXoffset), + Q_ARG(int, previewYoffset), Q_ARG(uint, direction)); } void TreeLandWindowMonitor::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const diff --git a/panels/dock/taskmanager/treelandwindowmonitor.h b/panels/dock/taskmanager/treelandwindowmonitor.h index 8da63ebf8..25e5ef3b4 100644 --- a/panels/dock/taskmanager/treelandwindowmonitor.h +++ b/panels/dock/taskmanager/treelandwindowmonitor.h @@ -4,14 +4,13 @@ #pragma once -#include "treelandwindow.h" #include "abstractwindowmonitor.h" #include "qwayland-treeland-foreign-toplevel-manager-unstable-v3.h" +#include "treelandwindow.h" #include #include #include -#include #include @@ -32,38 +31,13 @@ class ForeignToplevelManager : public QWaylandClientExtensionTemplate, public QtWayland::treeland_dock_preview_context_v3 -{ - Q_OBJECT - -public: - explicit TreeLandDockPreviewContext(struct ::treeland_dock_preview_context_v3 *); - ~TreeLandDockPreviewContext(); - void showWindowsPreview(QByteArray windowsId, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction); - void hideWindowsPreview(); - -Q_SIGNALS: - void entered(); - void exited(); - void closed(); - -protected: - virtual void treeland_dock_preview_context_v3_enter() override; - virtual void treeland_dock_preview_context_v3_leave() override; - friend class TreeLandWindowMonitor; - -private: - bool m_isPreviewEntered; - bool m_isDockMouseAreaEnter; - QTimer* m_hideTimer; -}; - class TreeLandWindowMonitor : public AbstractWindowMonitor { Q_OBJECT public: - explicit TreeLandWindowMonitor(QObject* parent = nullptr); + explicit TreeLandWindowMonitor(QObject *panel, QObject *parent = nullptr); + ~TreeLandWindowMonitor() override; virtual void start() override; virtual void stop() override; virtual void clear() override; @@ -85,10 +59,13 @@ private Q_SLOTS: void updateFullscreenState(); private: + void ensureDockPreviewContext(QWindow *anchor); + void releaseDockPreviewContext(); + + QPointer m_panel; + QPointer m_dockPreview; QHash> m_windows; QScopedPointer m_foreignToplevelManager; - QScopedPointer m_dockPreview; - bool m_fullscreenState; }; } diff --git a/panels/dock/waylanddockhelper.cpp b/panels/dock/waylanddockhelper.cpp index 6e72cb112..3bf111425 100644 --- a/panels/dock/waylanddockhelper.cpp +++ b/panels/dock/waylanddockhelper.cpp @@ -13,17 +13,122 @@ #include "qwayland-treeland-region-watch-unstable-v1.h" #include "wayland-treeland-region-watch-unstable-v1-client-protocol.h" +#include +#include +#include #include #include #include namespace dock { +namespace { +// Treeland assigns the role after the first buffer is committed. Creating an +// xdg or layer surface here would make show_tooltip_surface a protocol error. +class TooltipShellIntegration : public QtWaylandClient::QWaylandShellIntegration +{ +public: + bool initialize(QtWaylandClient::QWaylandDisplay *) override { return true; } + QtWaylandClient::QWaylandShellSurface *createShellSurface(QtWaylandClient::QWaylandWindow *window) override + { + return new QtWaylandClient::QWaylandShellSurface(window); + } +}; +} + +TreeLandDockPreviewManager::TreeLandDockPreviewManager() + : QWaylandClientExtensionTemplate(1) +{ +} + +void TreeLandDockPreviewManager::treeland_foreign_toplevel_manager_v3_toplevel(struct ::treeland_foreign_toplevel_handle_v3 *toplevel) +{ + // This binding only creates preview contexts. TaskManager tracks the windows. + treeland_foreign_toplevel_handle_v3_destroy(toplevel); +} + +TreeLandDockPreviewContext::TreeLandDockPreviewContext(struct ::treeland_dock_preview_context_v3 *context) + : QWaylandClientExtensionTemplate(1) +{ + init(context); + m_hideTimer.setSingleShot(true); + m_hideTimer.setInterval(800); + connect(&m_hideTimer, &QTimer::timeout, this, [this]() { + if (!m_isDockMouseAreaEnter && !m_isPreviewEntered) { + m_tooltipActive = false; + close(); + Q_EMIT closed(); + } + }); +} + +TreeLandDockPreviewContext::~TreeLandDockPreviewContext() +{ + if (isInitialized()) + destroy(); +} + +void TreeLandDockPreviewContext::showWindowsPreview(const QByteArray &windows, int x, int y, uint direction) +{ + m_tooltipActive = false; + m_isDockMouseAreaEnter = true; + m_hideTimer.stop(); + Q_EMIT windowPreviewShown(); + show(windows, x, y, direction); +} + +void TreeLandDockPreviewContext::showTooltip(struct ::wl_surface *surface, int x, int y, uint direction) +{ + m_tooltipActive = true; + m_isDockMouseAreaEnter = true; + m_isPreviewEntered = false; + m_hideTimer.stop(); + show_tooltip_surface(surface, x, y, direction); +} + +void TreeLandDockPreviewContext::hideWindowsPreview() +{ + if (m_tooltipActive) + return; + m_isDockMouseAreaEnter = false; + m_hideTimer.start(); +} + +void TreeLandDockPreviewContext::hideTooltip() +{ + if (!m_tooltipActive) + return; + m_tooltipActive = false; + m_isDockMouseAreaEnter = false; + m_hideTimer.stop(); + close(); + Q_EMIT closed(); +} + +void TreeLandDockPreviewContext::treeland_dock_preview_context_v3_enter() +{ + m_isPreviewEntered = true; +} + +void TreeLandDockPreviewContext::treeland_dock_preview_context_v3_leave() +{ + m_isPreviewEntered = false; + m_hideTimer.start(); +} + WaylandDockHelper::WaylandDockHelper(DockPanel *panel) : DockHelper(panel) , m_isWindowOverlap(false) , m_isCurrentActiveWindowFullscreened(false) , m_panel(panel) { + m_previewManager.reset(new TreeLandDockPreviewManager()); + connect(m_previewManager.get(), &TreeLandDockPreviewManager::activeChanged, this, [this]() { + if (!m_previewManager->isActive()) + resetDockPreview(); + }); + connect(m_panel, &DockPanel::rootObjectChanged, this, &WaylandDockHelper::resetDockPreview); + connect(m_panel, &DockPanel::toolTipWindowChanged, this, &WaylandDockHelper::setupTooltipWindow); + setupTooltipWindow(); m_xwindowControl.reset(new TreeLandXWindowControl()); m_regionWatchManager.reset(new TreeLandRegionWatchManager()); DS_NAMESPACE::DAppletBridge bridge("org.deepin.ds.dock.taskmanager"); @@ -57,6 +162,130 @@ WaylandDockHelper::WaylandDockHelper(DockPanel *panel) } +WaylandDockHelper::~WaylandDockHelper() +{ + resetDockPreview(); +} + +void WaylandDockHelper::setupTooltipWindow() +{ + closeTooltip(); + if (m_tooltipWindow) + disconnect(m_tooltipWindow, nullptr, this, nullptr); + m_tooltipWindow = m_panel->toolTipWindow(); + if (!m_tooltipWindow) + return; + + connect(m_tooltipWindow, SIGNAL(updateGeometryFinished()), m_tooltipWindow, SLOT(update()), Qt::UniqueConnection); + connect(m_tooltipWindow, &QObject::destroyed, this, &WaylandDockHelper::closeTooltip); + connect(m_tooltipWindow, &QQuickWindow::frameSwapped, + this, &WaylandDockHelper::showTooltip, Qt::QueuedConnection); +} + +bool WaylandDockHelper::eventFilter(QObject *watched, QEvent *event) +{ + if (watched != m_tooltipWindow) + return DockHelper::eventFilter(watched, event); + + switch (event->type()) { + case QEvent::Show: { + if (!dockPreviewContext(m_panel->window())) + break; + + // QShowEvent precedes QWaylandWindow::setVisible(), where Qt assigns a role. + auto *native = dynamic_cast(m_tooltipWindow->handle()); + if (!native || native->shellSurface() || native->QPlatformWindow::parent()) + break; + + static TooltipShellIntegration integration; + native->setShellIntegration(&integration); + break; + } + case QEvent::Close: + case QEvent::Hide: + closeTooltip(); + break; + default: + break; + } + return false; +} + +void WaylandDockHelper::closeTooltip() +{ + if (m_dockPreview) + m_dockPreview->hideTooltip(); + if (!m_tooltipWindow) + return; + + auto *native = dynamic_cast(m_tooltipWindow->handle()); + if (native && dynamic_cast(native->shellIntegration())) { + if (m_tooltipWindow->isVisible()) + m_tooltipWindow->hide(); + else // QEvent::Hide arrives after Qt destroys the shell surface. + native->setShellIntegration(native->display()->shellIntegration()); + } +} + +QObject *WaylandDockHelper::dockPreviewContext(QWindow *anchor) +{ + if (!anchor || !m_previewManager->isActive()) + return nullptr; + if (m_dockPreview && m_previewAnchor == anchor) + return m_dockPreview.get(); + + auto *native = dynamic_cast(anchor->handle()); + if (!native || !native->wlSurface()) + return nullptr; + + resetDockPreview(); + m_previewAnchor = anchor; + auto *context = m_previewManager->get_dock_preview_context(native->wlSurface()); + m_dockPreview.reset(new TreeLandDockPreviewContext(context)); + connect(anchor, &QWindow::visibleChanged, m_dockPreview.get(), [this](bool visible) { + if (!visible) + resetDockPreview(); + }); + connect(anchor, &QObject::destroyed, m_dockPreview.get(), [this]() { resetDockPreview(); }); + connect(native, &QtWaylandClient::QWaylandWindow::wlSurfaceDestroyed, + m_dockPreview.get(), [this]() { resetDockPreview(); }); + // Late tooltip closes and frames must not replace a new preview. + connect(m_dockPreview.get(), &TreeLandDockPreviewContext::windowPreviewShown, this, &WaylandDockHelper::closeTooltip); + return m_dockPreview.get(); +} + +void WaylandDockHelper::resetDockPreview() +{ + closeTooltip(); + m_dockPreview.reset(); + m_previewAnchor.clear(); +} + +void WaylandDockHelper::showTooltip() +{ + if (!m_tooltipWindow || !m_dockPreview || !m_tooltipWindow->isVisible()) + return; + + auto *native = dynamic_cast(m_tooltipWindow->handle()); + if (!native || !dynamic_cast(native->shellIntegration()) || !native->wlSurface()) + return; + + const QRectF geometry(QPointF(m_tooltipWindow->property("xOffset").toReal(), + m_tooltipWindow->property("yOffset").toReal()), + m_tooltipWindow->size()); + const auto direction = m_panel->position(); + QPointF anchor = geometry.center(); + switch (direction) { + case Top: anchor.setY(geometry.top()); break; + case Right: anchor.setX(geometry.right()); break; + case Bottom: anchor.setY(geometry.bottom()); break; + case Left: anchor.setX(geometry.left()); break; + default: return; + } + m_dockPreview->showTooltip(native->wlSurface(), qRound(anchor.x()), qRound(anchor.y()), direction); + wl_display_flush(native->display()->wl_display()); +} + void WaylandDockHelper::updateRegionWatchPos() { if (!m_regionWatch) diff --git a/panels/dock/waylanddockhelper.h b/panels/dock/waylanddockhelper.h index d135ea389..3e888ab3f 100644 --- a/panels/dock/waylanddockhelper.h +++ b/panels/dock/waylanddockhelper.h @@ -10,6 +10,7 @@ #include "qwayland-treeland-wallpaper-color-v1.h" #include "qwayland-treeland-xwindow-control-unstable-v1.h" #include "qwayland-treeland-region-watch-unstable-v1.h" +#include "qwayland-treeland-foreign-toplevel-manager-unstable-v3.h" #include #include @@ -22,6 +23,8 @@ class TreeLandDockTriggerArea; class TreeLandXWindowControl; class TreeLandRegionWatchManager; class TreeLandRegionWatch; +class TreeLandDockPreviewManager; +class TreeLandDockPreviewContext; class WaylandDockHelper : public DockHelper { @@ -29,9 +32,12 @@ class WaylandDockHelper : public DockHelper public: WaylandDockHelper(DockPanel *panel); + ~WaylandDockHelper() override; void setDockColorTheme(const ColorTheme &theme); QString dockScreenName(); + + QObject *dockPreviewContext(QWindow *anchor) override; // Move XEmbed window relative to anchor window's surface // anchorWindow: the window containing the plugin item; falls back to dock panel if null @@ -43,6 +49,7 @@ class WaylandDockHelper : public DockHelper void xembedWindowMoveResult(uint32_t wid, bool success); protected: + bool eventFilter(QObject *watched, QEvent *event) override; bool currentActiveWindowFullscreened() override; bool isWindowOverlap() override; [[nodiscard]] virtual DockWakeUpArea *createArea(QScreen *screen) override; @@ -51,9 +58,15 @@ class WaylandDockHelper : public DockHelper protected Q_SLOTS: void setCurrentActiveWindowFullscreened(bool); +private Q_SLOTS: + void showTooltip(); + private: void updateRegionWatchPos(); void initWallpaperColorManager(); + void resetDockPreview(); + void setupTooltipWindow(); + void closeTooltip(); private: friend class TreeLandRegionWatch; @@ -65,6 +78,46 @@ protected Q_SLOTS: QScopedPointer m_regionWatchManager; QScopedPointer m_xwindowControl; struct ::wl_surface *m_dockWlSurface = nullptr; // Dock's wl_surface for XEmbed positioning + QScopedPointer m_previewManager; + QScopedPointer m_dockPreview; + QPointer m_previewAnchor; + QPointer m_tooltipWindow; +}; + +class TreeLandDockPreviewManager : public QWaylandClientExtensionTemplate, public QtWayland::treeland_foreign_toplevel_manager_v3 +{ + Q_OBJECT +public: + TreeLandDockPreviewManager(); + +protected: + void treeland_foreign_toplevel_manager_v3_toplevel(struct ::treeland_foreign_toplevel_handle_v3 *toplevel) override; +}; + +class TreeLandDockPreviewContext : public QWaylandClientExtensionTemplate, public QtWayland::treeland_dock_preview_context_v3 +{ + Q_OBJECT +public: + explicit TreeLandDockPreviewContext(struct ::treeland_dock_preview_context_v3 *context); + ~TreeLandDockPreviewContext(); + Q_INVOKABLE void showWindowsPreview(const QByteArray &windows, int x, int y, uint direction); + Q_INVOKABLE void hideWindowsPreview(); + void showTooltip(struct ::wl_surface *surface, int x, int y, uint direction); + void hideTooltip(); + +Q_SIGNALS: + void closed(); + void windowPreviewShown(); + +protected: + void treeland_dock_preview_context_v3_enter() override; + void treeland_dock_preview_context_v3_leave() override; + +private: + bool m_tooltipActive = false; + bool m_isPreviewEntered = false; + bool m_isDockMouseAreaEnter = false; + QTimer m_hideTimer; }; class WallpaperColorManager : public QWaylandClientExtensionTemplate, public QtWayland::treeland_wallpaper_color_manager_v1