Skip to content

feat: add attention state support for treeland task manager #1599

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

Draft
18202781743 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: add attention state support for treeland task manager #1599

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
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Build-Depends:
qt6-wayland-dev-tools,
qt6-wayland-private-dev,
systemd,
treeland-protocols,
treeland-protocols (>> 0.5.7),
wayland-protocols,
Standards-Version: 4.6.2
Homepage: https://github.com/linuxdeepin/dde-shell
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ add_library(dock-taskmanager SHARED ${DBUS_INTERFACES}

qt_generate_wayland_protocol_client_sources(dock-taskmanager
FILES
${TREELAND_PROTOCOLS_DATA_DIR}/treeland-foreign-toplevel-manager-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/protocol/treeland-foreign-toplevel-manager-v1.xml
${WaylandProtocols_DATADIR}/staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml
)

Expand Down
4 changes: 2 additions & 2 deletions panels/dock/taskmanager/treelandwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
Q_LOGGING_CATEGORY(waylandwindowLog, "org.deepin.dde.shell.dock.taskmanager.treelandwindow")

namespace dock {
ForeignToplevelHandle::ForeignToplevelHandle(struct ::treeland_foreign_toplevel_handle_v1 *object)

Check warning on line 19 in panels/dock/taskmanager/treelandwindow.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Member variable 'ForeignToplevelHandle::m_identifier' is not initialized in the constructor. Member variables of native types, pointers, or references are left uninitialized when the class is instantiated. That may cause bugs or undefined behavior.
: QWaylandClientExtensionTemplate<ForeignToplevelHandle>(1)
: QWaylandClientExtensionTemplate<ForeignToplevelHandle>(2)
, QtWayland::treeland_foreign_toplevel_handle_v1(object)
, m_pid(0)
, m_isReady(false)
Expand Down Expand Up @@ -172,9 +172,9 @@
return true;
}

bool TreeLandWindow::isAttention()

Check warning on line 175 in panels/dock/taskmanager/treelandwindow.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'isAttention' is never used.
{
return false;
return m_foreignToplevelHandle->state().contains(Attention);
}

void TreeLandWindow::close()
Expand Down
5 changes: 3 additions & 2 deletions panels/dock/taskmanager/treelandwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -67,7 +67,8 @@ class TreeLandWindow : public AbstractWindow
Active = QtWayland::treeland_foreign_toplevel_handle_v1::state_activated,
Maximized = QtWayland::treeland_foreign_toplevel_handle_v1::state_maximized,
Minimized = QtWayland::treeland_foreign_toplevel_handle_v1::state_minimized,
Fullscreen = QtWayland::treeland_foreign_toplevel_handle_v1::state_fullscreen
Fullscreen = QtWayland::treeland_foreign_toplevel_handle_v1::state_fullscreen,
Attention = QtWayland::treeland_foreign_toplevel_handle_v1::state_attention
};

public:
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/treelandwindowmonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace dock {
ForeignToplevelManager::ForeignToplevelManager(TreeLandWindowMonitor* monitor)
: QWaylandClientExtensionTemplate<ForeignToplevelManager>(1)
: QWaylandClientExtensionTemplate<ForeignToplevelManager>(2)
, m_monitor(monitor)
{
}
Expand Down
Loading