From 4e4f3c48aca03d9627ca0526d6792cf44d4189db Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Thu, 2 Apr 2026 09:17:07 +0300
Subject: [PATCH] Add support for xx-fractional-scale-v2

---
 src/qwaylandlayersurface.cpp | 19 +++++++++++++++----
 src/qwaylandlayersurface_p.h |  8 ++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/qwaylandlayersurface.cpp b/src/qwaylandlayersurface.cpp
index c6beb6f..9a6c6f3 100644
--- a/src/qwaylandlayersurface.cpp
+++ b/src/qwaylandlayersurface.cpp
@@ -104,7 +104,11 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_closed()
 void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height)
 {
     ack_configure(serial);
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
     m_pendingSize = QSize(width, height);
+#else
+    m_pendingSize = QSizeF(width, height) / compositorToClientScale();
+#endif
 
     if (!m_configured) {
         m_configured = true;
@@ -133,7 +137,7 @@ void QWaylandLayerSurface::applyConfigure()
     window()->resizeFromApplyConfigure(m_pendingSize);
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 12, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
 void QWaylandLayerSurface::setDesiredSize(const QSize &size)
 {
     const bool horizontallyConstrained = m_interface->anchors().testFlags({Window::AnchorLeft, Window::AnchorRight});
@@ -154,7 +158,7 @@ void QWaylandLayerSurface::setDesiredSize(const QSizeF &size)
     const bool horizontallyConstrained = m_interface->anchors().testFlags({Window::AnchorLeft, Window::AnchorRight});
     const bool verticallyConstrained = m_interface->anchors().testFlags({Window::AnchorTop, Window::AnchorBottom});
 
-    QSize effectiveSize = size.toSize();
+    QSize effectiveSize = (size * clientToCompositorScale()).toSize();
     if (horizontallyConstrained) {
         effectiveSize.setWidth(0);
     }
@@ -172,7 +176,7 @@ void QWaylandLayerSurface::setAnchor(uint anchor)
 
 void QWaylandLayerSurface::setExclusiveZone(int32_t zone)
 {
-    set_exclusive_zone(zone);
+    set_exclusive_zone(std::round(zone * clientToCompositorScale()));
 }
 
 void QWaylandLayerSurface::setExclusiveEdge(uint32_t edge)
@@ -184,7 +188,14 @@ void QWaylandLayerSurface::setExclusiveEdge(uint32_t edge)
 
 void QWaylandLayerSurface::setMargins(const QMargins &margins)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
     set_margin(margins.top(), margins.right(), margins.bottom(), margins.left());
+#else
+    set_margin(std::round(margins.top() * clientToCompositorScale()),
+               std::round(margins.right() * clientToCompositorScale()),
+               std::round(margins.bottom() * clientToCompositorScale()),
+               std::round(margins.left() * clientToCompositorScale()));
+#endif
 }
 
 void QWaylandLayerSurface::setKeyboardInteractivity(uint32_t interactivity)
@@ -198,7 +209,7 @@ void QWaylandLayerSurface::setLayer(uint32_t layer)
         set_layer(layer);
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 12, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
 void QWaylandLayerSurface::setWindowSize(const QSize &size)
 #else
 void QWaylandLayerSurface::setWindowSize(const QSizeF &size)
diff --git a/src/qwaylandlayersurface_p.h b/src/qwaylandlayersurface_p.h
index 9bb8474..6c8b200 100644
--- a/src/qwaylandlayersurface_p.h
+++ b/src/qwaylandlayersurface_p.h
@@ -34,7 +34,7 @@ public:
     }
     void attachPopup(QtWaylandClient::QWaylandShellSurface *popup) override;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 12, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
     void setDesiredSize(const QSize &size);
 #else
     void setDesiredSize(const QSizeF &size);
@@ -47,7 +47,7 @@ public:
     void setLayer(uint32_t layer);
 
     void applyConfigure() override;
-#if QT_VERSION < QT_VERSION_CHECK(6, 12, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
     void setWindowSize(const QSize &size) override;
 #else
     void setWindowSize(const QSizeF &size) override;
@@ -66,7 +66,11 @@ private:
     QWaylandLayerShellIntegration *m_shell;
     LayerShellQt::Window *m_interface;
     QtWaylandClient::QWaylandWindow *m_window;
+#if QT_VERSION < QT_VERSION_CHECK(6, 13, 0)
     QSize m_pendingSize;
+#else
+    QSizeF m_pendingSize;
+#endif
     QString m_activationToken;
 
     bool m_configured = false;