Fix for 2091 (#2290)

Author: marcusbritanicus

panel/backends/wayland/wlroots/CMakeLists.txt

@@ -17,7 +17,7 @@ if (NOT DEFINED PLUGIN_DIR)
     set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROGRAM})
 endif (NOT DEFINED PLUGIN_DIR)
 
-set(QTX_LIBRARIES Qt6::Gui Qt6::GuiPrivate)
+set(QTX_LIBRARIES Qt6::Gui Qt6::GuiPrivate Qt6::WaylandClient Qt6::WaylandClientPrivate)
 
 set(
     SRC
@@ -28,7 +28,7 @@ set(
 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 Qt6Xdg)
+target_link_libraries(${NAME} ${QTX_LIBRARIES} Qt6::Concurrent Qt6Xdg)
 
 qt6_generate_wayland_protocol_client_sources(${NAME} FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/wlr-foreign-toplevel-management-unstable-v1.xml

panel/backends/wayland/wlroots/lxqtwmbackend_wlr.cpp

@@ -6,6 +6,8 @@
 #include <QScreen>
 #include <algorithm>
 
+#include <private/qwaylandscreen_p.h>
+
 // Function to erase a window from the vector
 void eraseWindow(std::vector<WId>& windows, WId tgt) {
     // Use std::vector::iterator to find the window
@@ -270,10 +272,19 @@ void LXQtTaskbarWlrootsBackend::moveApplicationToPrevNextMonitor(WId, bool, bool
 {
 }
 
-bool LXQtTaskbarWlrootsBackend::isWindowOnScreen(QScreen *, WId) const
+bool LXQtTaskbarWlrootsBackend::isWindowOnScreen(QScreen *screen, WId windowId) const
 {
-    // TODO: Manage based on output-enter/output-leave
-    return true;
+    LXQtTaskbarWlrootsWindow *window = getWindow(windowId);
+    if(window)
+    {
+        QtWaylandClient::QWaylandScreen *waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen*>(screen->handle());
+        if (waylandScreen) {
+            wl_output *output = waylandScreen->output();
+            return window->windowState.outputs.contains( output );
+        }
+    }
+
+    return false;
 }
 
 bool LXQtTaskbarWlrootsBackend::setDesktopLayout(Qt::Orientation, int, int, bool) {
@@ -449,6 +460,7 @@ void LXQtTaskbarWlrootsBackend::addToWindows(WId winId)
     connect(window, &LXQtTaskbarWlrootsWindow::fullscreenChanged, this, &LXQtTaskbarWlrootsBackend::onStateChanged);
     connect(window, &LXQtTaskbarWlrootsWindow::maximizedChanged, this, &LXQtTaskbarWlrootsBackend::onStateChanged);
     connect(window, &LXQtTaskbarWlrootsWindow::minimizedChanged, this, &LXQtTaskbarWlrootsBackend::onStateChanged);
+    connect(window, &LXQtTaskbarWlrootsWindow::outputsChanged, this, &LXQtTaskbarWlrootsBackend::onOutputsChanged);
 
     emit windowAdded( winId );
     emit windowPropertyChanged(winId, int(LXQtTaskBarWindowProperty::WindowClass));
@@ -615,6 +627,12 @@ void LXQtTaskbarWlrootsBackend::onStateChanged()
         emit windowPropertyChanged(window->getWindowId(), int(LXQtTaskBarWindowProperty::State));
 }
 
+void LXQtTaskbarWlrootsBackend::onOutputsChanged()
+{
+    if (auto window = qobject_cast<LXQtTaskbarWlrootsWindow *>(QObject::sender()))
+        emit windowPropertyChanged(window->getWindowId(), int(LXQtTaskBarWindowProperty::Workspace));
+}
+
 bool LXQtTaskbarWlrootsBackend::acceptWindow(WId window) const
 {
     if(transients.contains(window))

panel/backends/wayland/wlroots/lxqtwmbackend_wlr.h

@@ -81,6 +81,7 @@ private slots:
     void onTitleChanged();
     void onAppIdChanged();
     void onStateChanged();
+    void onOutputsChanged();
 
 private:
     void addToWindows(WId winId);