Make sure that the layer property gets initialised

Much like with the rest of the properties, we should set whichever value
was in the interface and then subscribe to changes in the property.
Otherwise, the layer doesn't get forwarded to the surface if the value
was set before its initialisation.

Signed-off-by: Victoria Fischer <[email protected]>

CMakeLists.txt

@@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "6.1.3")
+set(PROJECT_VERSION "6.1.90")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)
 
-set(QT_MIN_VERSION "6.6.0")
+set(QT_MIN_VERSION "6.7.0")
-set(KF6_MIN_VERSION "6.2.0")
+set(KF6_MIN_VERSION "6.5.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 set(CMAKE_CXX_STANDARD 20)

src/CMakeLists.txt

@@ -4,10 +4,16 @@
 remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
 
 add_library(LayerShellQtInterface)
-qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES
+
-    ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
+if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
-    ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+    set(private_code_option  "PRIVATE_CODE")
-    ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
+endif()
+qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface
+    ${private_code_option}
+    FILES
+        ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
+        ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
 )
 
 ecm_qt_declare_logging_category(LayerShellQtInterface

src/qwaylandlayersurface.cpp

@@ -37,6 +37,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
         }
     }
     init(shell->get_layer_surface(window->waylandSurface()->object(), output, m_interface->layer(), m_interface->scope()));
+    setLayer(m_interface->layer());
     connect(m_interface, &Window::layerChanged, this, [this]() {
         setLayer(m_interface->layer());
     });
@@ -110,9 +111,13 @@ void QWaylandLayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface *po
 
 void QWaylandLayerSurface::applyConfigure()
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     m_configuring = true;
+#endif
     window()->resizeFromApplyConfigure(m_pendingSize);
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     m_configuring = false;
+#endif
 }
 
 void QWaylandLayerSurface::setDesiredSize(const QSize &size)
@@ -163,6 +168,7 @@ void QWaylandLayerSurface::setLayer(uint32_t layer)
         set_layer(layer);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
 void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
 {
     if (m_configuring) {
@@ -171,6 +177,12 @@ void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
 
     setDesiredSize(geometry.size());
 }
+#else
+void QWaylandLayerSurface::setWindowSize(const QSize &size)
+{
+    setDesiredSize(size);
+}
+#endif
 
 bool QWaylandLayerSurface::requestActivate()
 {
@@ -220,8 +232,10 @@ void QWaylandLayerSurface::sendExpose()
 {
 #if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
     window()->handleExpose(QRect(QPoint(), m_pendingSize));
-#else
+#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     window()->sendRecursiveExposeEvent();
+#else
+    window()->updateExposure();
 #endif
 }
 

src/qwaylandlayersurface_p.h

@@ -43,7 +43,11 @@ public:
     void setLayer(uint32_t layer);
 
     void applyConfigure() override;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     void setWindowGeometry(const QRect &geometry) override;
+#else
+    void setWindowSize(const QSize &size) override;
+#endif
 
     bool requestActivate() override;
     void setXdgActivationToken(const QString &token) override;
@@ -61,7 +65,9 @@ private:
     QString m_activationToken;
 
     bool m_configured = false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     bool m_configuring = false;
+#endif
 };
 
 }