Fix

lxqt · Jul 12, 2024 · 4301ecf · 4301ecf
1 parent 1a1691c
commit 4301ecf
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/panel/backends/wayland/kwin_wayland/CMakeLists.txt b/panel/backends/wayland/kwin_wayland/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(NAME kwin_wayland_backend)
+set(PROGRAM "lxqt-panel")
+set(BACKEND "backend")
+project(${PROGRAM}_${BACKEND}_${NAME})
+
+find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS WaylandClient Concurrent)
+
+set(PROG_SHARE_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/lxqt/${PROGRAM}/${BACKEND})
+set(PLUGIN_SHARE_DIR ${PROG_SHARE_DIR}/${BACKEND}/${NAME})
+#************************************************
+
+if (NOT DEFINED PLUGIN_DIR)
+    set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROGRAM})
+endif (NOT DEFINED PLUGIN_DIR)
+
+set(QTX_LIBRARIES Qt6::Gui)
+
+set(SRC
+    lxqtwmbackend_kwinwayland.h
+    lxqtwmbackend_kwinwayland.cpp
+
+    lxqtplasmavirtualdesktop.h
+    lxqtplasmavirtualdesktop.cpp
+
+    lxqttaskbarplasmawindowmanagment.h
+    lxqttaskbarplasmawindowmanagment.cpp
+)
+
+add_library(${NAME} MODULE ${SRC}) # build dynamically loadable modules
+install(TARGETS ${NAME} DESTINATION ${PLUGIN_DIR}/${BACKEND}) # install the *.so file
+
+target_link_libraries(${NAME} ${QTX_LIBRARIES} Qt6::Concurrent Qt6::WaylandClient)
+
+qt6_generate_wayland_protocol_client_sources(${NAME} FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/plasma-window-management.xml
+)
+
+qt6_generate_wayland_protocol_client_sources(${NAME} FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/org-kde-plasma-virtual-desktop.xml
+)
diff --git a/panel/backends/wayland/kwin_wayland/lxqtwmbackend_kwinwayland.cpp b/panel/backends/wayland/kwin_wayland/lxqtwmbackend_kwinwayland.cpp
@@ -50,7 +50,7 @@ auto findWindow(const std::vector<std::unique_ptr<LXQtTaskBarPlasmaWindow>>& win
 }
 
 LXQtWMBackend_KWinWayland::LXQtWMBackend_KWinWayland(QObject *parent) :
-    ILXQtWMBackendLibrary(parent)
+    ILXQtAbstractWMInterface(parent)
 {
     m_managment.reset(new LXQtTaskBarPlasmaWindowManagment);
     m_workspaceInfo.reset(new LXQtPlasmaWaylandWorkspaceInfo);
@@ -77,7 +77,7 @@ LXQtWMBackend_KWinWayland::LXQtWMBackend_KWinWayland(QObject *parent) :
             });
 
     connect(m_workspaceInfo.get(), &LXQtPlasmaWaylandWorkspaceInfo::numberOfDesktopsChanged,
-            this, &ILXQtTaskbarAbstractBackend::workspacesCountChanged);
+            this, &ILXQtAbstractWMInterface::workspacesCountChanged);
 
     connect(m_workspaceInfo.get(), &LXQtPlasmaWaylandWorkspaceInfo::desktopNameChanged,
             this, [this](int idx) {