Skip to content

feat: tooltip and preview call to treeland #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Aug 23, 2024
Merged

feat: tooltip and preview call to treeland #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions panels/dock/taskmanager/package/AppItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ Item {
property int xOffset: 0
property int yOffset: 0
onTriggered: {
if (root.windows.length != 0) {
if (root.windows.length != 0 || Qt.platform.pluginName === "wayland") {
taskmanager.Applet.showItemPreview(root.itemId, Panel.rootObject, xOffset, yOffset, Panel.position)
}
}
Expand Down Expand Up @@ -323,7 +323,7 @@ Item {
}

onEntered: {
if (windows.length === 0) {
if (Qt.platform.pluginName === "xcb" && windows.length === 0) {
toolTipShowTimer.start()
return
}
Expand All @@ -347,7 +347,11 @@ Item {
toolTipShowTimer.stop()
}

if (windows.length === 0) {
if (previewTimer.running) {
previewTimer.stop()
}

if (Qt.platform.pluginName === "xcb" && windows.length === 0) {
toolTip.close()
return
}
Expand Down
26 changes: 17 additions & 9 deletions panels/dock/taskmanager/treelandwindowmonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ TreeLandDockPreviewContext::TreeLandDockPreviewContext(struct ::treeland_dock_pr
init(context);

m_hideTimer->setSingleShot(true);
m_hideTimer->setInterval(500);
m_hideTimer->setInterval(800);

connect(m_hideTimer, &QTimer::timeout, this, [this](){
if (!m_isDockMouseAreaEnter && !m_isPreviewEntered) {
Expand Down Expand Up @@ -128,14 +128,22 @@ void TreeLandWindowMonitor::showItemPreview(const QPointer<AppItem> &item, QObje
m_dockPreview.reset(new TreeLandDockPreviewContext(context));
}

QVarLengthArray array = QVarLengthArray<uint32_t>();

std::transform(item->getAppendWindows().begin(), item->getAppendWindows().end(), std::back_inserter(array), [](const QPointer<AbstractWindow>& window){
return window->id();
});

QByteArray windowIds(reinterpret_cast<char*>(array.data()));
m_dockPreview->showWindowsPreview(windowIds, previewXoffset, previewYoffset, direction);
auto windows = item->getAppendWindows();
m_dockPreview->m_isDockMouseAreaEnter = true;
if (windows.length() != 0) {
QVarLengthArray array = QVarLengthArray<uint32_t>();
std::transform(windows.begin(), windows.end(), std::back_inserter(array), [](const QPointer<AbstractWindow>& window){
return window->id();
});

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);
} else {
m_dockPreview->show_tooltip(item->name(), previewXoffset, previewYoffset, direction);
}
}

void TreeLandWindowMonitor::hideItemPreview()
Expand Down
2 changes: 2 additions & 0 deletions panels/dock/taskmanager/treelandwindowmonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class TreeLandDockPreviewContext : public QWaylandClientExtensionTemplate<TreeLa
protected:
virtual void treeland_dock_preview_context_v1_enter() override;
virtual void treeland_dock_preview_context_v1_leave() override;
friend class TreeLandWindowMonitor;

private:
bool m_isPreviewEntered;
bool m_isDockMouseAreaEnter;
Expand Down