ILXQtTaskbarAbstractBackend: add setDesktopLayout() function

- Use it in DesktopSwitch::settingsChanged()

Author: gfgit

panel/backends/ilxqttaskbarabstractbackend.h

@@ -60,6 +60,8 @@ class ILXQtTaskbarAbstractBackend : public QObject
 
     virtual bool isWindowOnScreen(QScreen *screen, WId windowId) const = 0;
 
+    virtual bool setDesktopLayout(Qt::Orientation orientation, int rows, int columns, bool rightToLeft) = 0;
+
     // X11 Specific
     virtual void moveApplication(WId windowId) = 0;
     virtual void resizeApplication(WId windowId) = 0;

panel/backends/lxqttaskbardummybackend.cpp

@@ -131,6 +131,11 @@ bool LXQtTaskBarDummyBackend::isWindowOnScreen(QScreen *, WId) const
     return false;
 }
 
+bool setDesktopLayout(Qt::Orientation, int, int, bool)
+{
+    return false;
+}
+
 /************************************************
  *   X11 Specific
  ************************************************/

panel/backends/lxqttaskbardummybackend.h

@@ -53,6 +53,8 @@ class LXQtTaskBarDummyBackend : public ILXQtTaskbarAbstractBackend
 
     bool isWindowOnScreen(QScreen *screen, WId windowId) const override;
 
+    virtual bool setDesktopLayout(Qt::Orientation orientation, int rows, int columns, bool rightToLeft) override;
+
     // X11 Specific
     void moveApplication(WId windowId) override;
     void resizeApplication(WId windowId) override;

panel/backends/xcb/lxqttaskbarbackend_x11.cpp

@@ -520,6 +520,25 @@ bool LXQtTaskbarX11Backend::isWindowOnScreen(QScreen *screen, WId windowId) cons
     return screen->geometry().intersects(r);
 }
 
+bool LXQtTaskbarX11Backend::setDesktopLayout(Qt::Orientation orientation, int rows, int columns, bool rightToLeft)
+{
+    NETRootInfo mDesktops(m_xcbConnection, NET::NumberOfDesktops | NET::CurrentDesktop | NET::DesktopNames, NET::WM2DesktopLayout);
+
+    if (orientation == Qt::Horizontal)
+    {
+        mDesktops.setDesktopLayout(NET::OrientationHorizontal,
+                                   columns, rows,
+                                   rightToLeft ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft);
+    }
+    else
+    {
+        mDesktops.setDesktopLayout(NET::OrientationHorizontal,
+                                   rows, columns,
+                                   rightToLeft ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft);
+    }
+    return true;
+}
+
 /************************************************
  *   X11 Specific
  ************************************************/

panel/backends/xcb/lxqttaskbarbackend_x11.h

@@ -55,6 +55,8 @@ class LXQtTaskbarX11Backend : public ILXQtTaskbarAbstractBackend
 
     virtual bool isWindowOnScreen(QScreen *screen, WId windowId) const override;
 
+    virtual bool setDesktopLayout(Qt::Orientation orientation, int rows, int columns, bool rightToLeft) override;
+
     // X11 Specific
     virtual void moveApplication(WId windowId) override;
     virtual void resizeApplication(WId windowId) override;

plugin-desktopswitch/desktopswitch.cpp

@@ -245,14 +245,9 @@ void DesktopSwitch::settingsChanged()
         // "DesktopSwitch::realign()". Therefore, the desktop layout should not be changed
         // inside the latter method.
         int columns = static_cast<int>(ceil(static_cast<float>(m_desktopCount) / mRows));
-        if (panel()->isHorizontal())
-        {
-            //mDesktops->setDesktopLayout(NET::OrientationHorizontal, columns, mRows, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft);
-        }
-        else
-        {
-            //mDesktops->setDesktopLayout(NET::OrientationHorizontal, mRows, columns, mWidget.isRightToLeft() ? NET::DesktopLayoutCornerTopRight : NET::DesktopLayoutCornerTopLeft);
-        }
+        mBackend->setDesktopLayout(panel()->isHorizontal() ? Qt::Horizontal : Qt::Vertical,
+                                   mRows, columns, mWidget.isRightToLeft());
+
         realign(); // in case it isn't called when the desktop layout changes
     }
     if (need_refresh)