Skip to content

Commit 4301ecf

Browse files
committed
Fix
1 parent 1a1691c commit 4301ecf

File tree

2 files changed

+42
-2
lines changed

2 files changed

+42
-2
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
set(NAME kwin_wayland_backend)
2+
set(PROGRAM "lxqt-panel")
3+
set(BACKEND "backend")
4+
project(${PROGRAM}_${BACKEND}_${NAME})
5+
6+
find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS WaylandClient Concurrent)
7+
8+
set(PROG_SHARE_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROGRAM}/${BACKEND})
9+
set(PLUGIN_SHARE_DIR ${PROG_SHARE_DIR}/${BACKEND}/${NAME})
10+
#************************************************
11+
12+
if (NOT DEFINED PLUGIN_DIR)
13+
set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROGRAM})
14+
endif (NOT DEFINED PLUGIN_DIR)
15+
16+
set(QTX_LIBRARIES Qt6::Gui)
17+
18+
set(SRC
19+
lxqtwmbackend_kwinwayland.h
20+
lxqtwmbackend_kwinwayland.cpp
21+
22+
lxqtplasmavirtualdesktop.h
23+
lxqtplasmavirtualdesktop.cpp
24+
25+
lxqttaskbarplasmawindowmanagment.h
26+
lxqttaskbarplasmawindowmanagment.cpp
27+
)
28+
29+
add_library(${NAME} MODULE ${SRC}) # build dynamically loadable modules
30+
install(TARGETS ${NAME} DESTINATION ${PLUGIN_DIR}/${BACKEND}) # install the *.so file
31+
32+
target_link_libraries(${NAME} ${QTX_LIBRARIES} Qt6::Concurrent Qt6::WaylandClient)
33+
34+
qt6_generate_wayland_protocol_client_sources(${NAME} FILES
35+
${CMAKE_CURRENT_SOURCE_DIR}/protocols/plasma-window-management.xml
36+
)
37+
38+
qt6_generate_wayland_protocol_client_sources(${NAME} FILES
39+
${CMAKE_CURRENT_SOURCE_DIR}/protocols/org-kde-plasma-virtual-desktop.xml
40+
)

panel/backends/wayland/kwin_wayland/lxqtwmbackend_kwinwayland.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ auto findWindow(const std::vector<std::unique_ptr<LXQtTaskBarPlasmaWindow>>& win
5050
}
5151

5252
LXQtWMBackend_KWinWayland::LXQtWMBackend_KWinWayland(QObject *parent) :
53-
ILXQtWMBackendLibrary(parent)
53+
ILXQtAbstractWMInterface(parent)
5454
{
5555
m_managment.reset(new LXQtTaskBarPlasmaWindowManagment);
5656
m_workspaceInfo.reset(new LXQtPlasmaWaylandWorkspaceInfo);
@@ -77,7 +77,7 @@ LXQtWMBackend_KWinWayland::LXQtWMBackend_KWinWayland(QObject *parent) :
7777
});
7878

7979
connect(m_workspaceInfo.get(), &LXQtPlasmaWaylandWorkspaceInfo::numberOfDesktopsChanged,
80-
this, &ILXQtTaskbarAbstractBackend::workspacesCountChanged);
80+
this, &ILXQtAbstractWMInterface::workspacesCountChanged);
8181

8282
connect(m_workspaceInfo.get(), &LXQtPlasmaWaylandWorkspaceInfo::desktopNameChanged,
8383
this, [this](int idx) {

0 commit comments

Comments
 (0)