Update version for new release 6.5.2

CMakeLists.txt

@@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "6.5.91")
+set(PROJECT_VERSION "6.5.2")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)
 
-set(QT_MIN_VERSION "6.10.0")
-set(KF6_MIN_VERSION "6.22.0")
+set(QT_MIN_VERSION "6.9.0")
+set(KF6_MIN_VERSION "6.18.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 set(CMAKE_CXX_STANDARD 20)
@@ -32,7 +32,6 @@ include(KDEClangFormat)
 include(ECMQtDeclareLoggingCategory)
 include(ECMQmlModule)
 include(KDEGitCommitHooks)
-include(ECMGenerateExportHeader)
 
 find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
 

src/CMakeLists.txt

@@ -64,12 +64,10 @@ ecm_generate_headers(LayerShellQt_HEADERS
 )
 
 
-ecm_generate_export_header(LayerShellQtInterface
+generate_export_header(LayerShellQtInterface
     BASE_NAME LayerShellQtInterface
     EXPORT_MACRO_NAME LAYERSHELLQT_EXPORT
     EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
-    VERSION ${LAYERSHELLQT_VERSION}
-    DEPRECATION_VERSIONS 6.6
 )
 
 install(TARGETS layer-shell

src/declarative/CMakeLists.txt

@@ -4,7 +4,7 @@
 ecm_add_qml_module(LayerShellQtQml
                   URI "org.kde.layershell"
                   VERSION 1.0
-                  SOURCES types.h
+                  SOURCES types.h types.cpp
                   GENERATE_PLUGIN_SOURCE)
 target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
 

src/declarative/types.cpp

@@ -0,0 +1,49 @@
+/*
+ *   SPDX-FileCopyrightText: 2023 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
+ *
+ *   SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+ */
+
+#include "types.h"
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 1)
+int QQmlMarginsValueType::left() const
+{
+    return m.left();
+}
+
+int QQmlMarginsValueType::top() const
+{
+    return m.top();
+}
+
+int QQmlMarginsValueType::right() const
+{
+    return m.right();
+}
+
+int QQmlMarginsValueType::bottom() const
+{
+    return m.bottom();
+}
+
+void QQmlMarginsValueType::setLeft(int left)
+{
+    m.setLeft(left);
+}
+
+void QQmlMarginsValueType::setTop(int top)
+{
+    m.setTop(top);
+}
+
+void QQmlMarginsValueType::setRight(int right)
+{
+    m.setRight(right);
+}
+
+void QQmlMarginsValueType::setBottom(int bottom)
+{
+    m.setBottom(bottom);
+}
+#endif

src/declarative/types.h

@@ -17,3 +17,39 @@ class WindowForeign
     QML_UNCREATABLE("")
     QML_ATTACHED(LayerShellQt::Window)
 };
+
+// available upstream since https://invent.kde.org/qt/qt/qtdeclarative/-/commit/a398101f715bfc447aa889fc9c58b13bfe75ab47
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 1)
+struct Q_QML_EXPORT QQmlMarginsValueType {
+    QMargins m;
+    Q_PROPERTY(int left READ left WRITE setLeft FINAL)
+    Q_PROPERTY(int right READ right WRITE setRight FINAL)
+    Q_PROPERTY(int top READ top WRITE setTop FINAL)
+    Q_PROPERTY(int bottom READ bottom WRITE setBottom FINAL)
+    Q_GADGET
+    QML_ANONYMOUS
+    QML_FOREIGN(QMargins)
+    QML_EXTENDED(QQmlMarginsValueType)
+    QML_STRUCTURED_VALUE
+
+public:
+    QQmlMarginsValueType() = default;
+    Q_INVOKABLE QQmlMarginsValueType(const QMarginsF &margins)
+        : m(margins.toMargins())
+    {
+    }
+    int left() const;
+    int right() const;
+    int top() const;
+    int bottom() const;
+    void setLeft(int);
+    void setRight(int);
+    void setTop(int);
+    void setBottom(int);
+
+    operator QMargins() const
+    {
+        return m;
+    }
+};
+#endif

src/interfaces/shell.cpp

@@ -5,9 +5,6 @@
  */
 
 #include "shell.h"
-
-#if LAYERSHELLQTINTERFACE_BUILD_DEPRECATED_SINCE(6, 6)
-
 #include <QByteArray>
 #include <layershellqt_logging.h>
 #include <qglobal.h>
@@ -21,4 +18,3 @@ void Shell::useLayerShell()
         qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
     }
 }
-#endif

src/interfaces/shell.h

@@ -8,9 +8,7 @@
 #define LAYERSHELLQTSHELL_H
 
 #include "layershellqt_export.h"
-
-#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
-
+#include "window.h"
 #include <QString>
 
 namespace LayerShellQt
@@ -21,11 +19,9 @@ namespace LayerShellQt
 class LAYERSHELLQT_EXPORT Shell
 {
 public:
-    LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Calling useLayerShell is not needed since Qt 6.5")
     static void useLayerShell();
 };
 
 }
-#endif
 
 #endif

src/interfaces/window.cpp

@@ -9,9 +9,7 @@
 
 #include <layershellqt_logging.h>
 
-#include <QPlatformSurfaceEvent>
 #include <QPointer>
-#include <mutex>
 #include <optional>
 
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
@@ -35,8 +33,7 @@ public:
     Window::Layer layer = Window::LayerTop;
     QMargins margins;
     QSize desiredSize = QSize(0, 0);
-    QPointer<QScreen> screen;
-    bool wantsToBeOnActiveScreen = false;
+    Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
     bool closeOnDismissed = true;
     bool activateOnShow = true;
 };
@@ -154,73 +151,14 @@ Window::Layer Window::layer() const
     return d->layer;
 }
 
-#if LAYERSHELLQTINTERFACE_BUILD_DEPRECATED_SINCE(6, 6)
 Window::ScreenConfiguration Window::screenConfiguration() const
 {
-    if (wantsToBeOnActiveScreen()) {
-        return ScreenFromCompositor;
-    } else {
-        // If an explicit screen is set, it's quite inaccurate but it should be fine.
-        return ScreenFromQWindow;
-    }
+    return d->screenConfiguration;
 }
 
-void Window::setScreenConfiguration(ScreenConfiguration screenConfiguration)
+void Window::setScreenConfiguration(Window::ScreenConfiguration screenConfiguration)
 {
-    static std::once_flag deprecationFlag;
-    std::call_once(deprecationFlag, []() {
-        qWarning() << "LayerShellQt.Window.screenConfiguration is deprecated use screen and wantsToBeOnActiveScreen instead";
-    });
-
-    if (screenConfiguration == ScreenFromCompositor) {
-        setWantsToBeOnActiveScreen(true);
-    } else {
-        setWantsToBeOnActiveScreen(false);
-        setScreen(nullptr);
-    }
-}
-#endif
-
-void Window::setWantsToBeOnActiveScreen(bool set)
-{
-    if (d->wantsToBeOnActiveScreen == set) {
-        return;
-    }
-
-    d->wantsToBeOnActiveScreen = set;
-
-    if (d->wantsToBeOnActiveScreen && d->screen) {
-        d->screen = nullptr;
-        Q_EMIT screenChanged();
-    }
-
-    Q_EMIT wantsToBeOnActiveScreenChanged();
-}
-
-bool Window::wantsToBeOnActiveScreen() const
-{
-    return d->wantsToBeOnActiveScreen;
-}
-
-void Window::setScreen(QScreen *screen)
-{
-    if (d->screen == screen) {
-        return;
-    }
-
-    d->screen = screen;
-
-    if (d->screen && d->wantsToBeOnActiveScreen) {
-        d->wantsToBeOnActiveScreen = false;
-        Q_EMIT wantsToBeOnActiveScreenChanged();
-    }
-
-    Q_EMIT screenChanged();
-}
-
-QScreen *Window::screen() const
-{
-    return d->screen;
+    d->screenConfiguration = screenConfiguration;
 }
 
 bool Window::closeOnDismissed() const
@@ -248,35 +186,12 @@ Window::Window(QWindow *window)
     , d(new WindowPrivate(window))
 {
     s_map.insert(d->parentWindow, this);
-    window->installEventFilter(this);
-    if (window->isVisible()) {
-        qCWarning(LAYERSHELLQT) << d->parentWindow << "already has a shell integration. Call QWindow::close() first and show it again.";
-    }
 
-    if (window->handle()) {
-        initializeShell();
-    }
-}
+    window->create();
 
-bool Window::eventFilter(QObject *watched, QEvent *event)
-{
-    auto window = qobject_cast<QWindow *>(watched);
-    if (!window) {
-        return false;
-    }
-    if (event->type() == QEvent::PlatformSurface) {
-        if (auto pse = static_cast<QPlatformSurfaceEvent *>(event); pse->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
-            initializeShell();
-        }
-    }
-    return false;
-}
-
-void Window::initializeShell()
-{
-    auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(d->parentWindow->handle());
+    auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
     if (!waylandWindow) {
-        qCWarning(LAYERSHELLQT) << d->parentWindow << "is not a wayland window. Not creating zwlr_layer_surface";
+        qCWarning(LAYERSHELLQT) << window << "is not a wayland window. Not creating zwlr_layer_surface";
         return;
     }
 
@@ -290,6 +205,7 @@ void Window::initializeShell()
             return;
         }
     }
+
     waylandWindow->setShellIntegration(shellIntegration);
 }
 

src/interfaces/window.h

@@ -27,12 +27,8 @@ class LAYERSHELLQT_EXPORT Window : public QObject
     Q_PROPERTY(qint32 exclusionZone READ exclusionZone WRITE setExclusiveZone NOTIFY exclusionZoneChanged)
     Q_PROPERTY(Layer layer READ layer WRITE setLayer NOTIFY layerChanged)
     Q_PROPERTY(KeyboardInteractivity keyboardInteractivity READ keyboardInteractivity WRITE setKeyboardInteractivity NOTIFY keyboardInteractivityChanged)
-    Q_PROPERTY(bool activateOnShow READ activateOnShow WRITE setActivateOnShow)
-    Q_PROPERTY(bool wantsToBeOnActiveScreen READ wantsToBeOnActiveScreen WRITE setWantsToBeOnActiveScreen NOTIFY wantsToBeOnActiveScreenChanged)
-    Q_PROPERTY(QScreen *screen READ screen WRITE setScreen NOTIFY screenChanged)
-#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
     Q_PROPERTY(ScreenConfiguration screenConfiguration READ screenConfiguration WRITE setScreenConfiguration)
-#endif
+    Q_PROPERTY(bool activateOnShow READ activateOnShow WRITE setActivateOnShow)
 
 public:
     ~Window() override;
@@ -68,6 +64,17 @@ public:
     };
     Q_ENUM(KeyboardInteractivity)
 
+    /**
+     * This enum type is used to specify which screen to place the surface on.
+     * ScreenFromQWindow (the default) reads QWindow::screen() while ScreenFromCompositor
+     * passes nil and lets the compositor decide.
+     */
+    enum ScreenConfiguration {
+        ScreenFromQWindow = 0,
+        ScreenFromCompositor = 1,
+    };
+    Q_ENUM(ScreenConfiguration)
+
     void setAnchors(Anchors anchor);
     Anchors anchors() const;
 
@@ -89,48 +96,8 @@ public:
     void setLayer(Layer layer);
     Layer layer() const;
 
-#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
-    /**
-     * This enum type is used to specify which screen to place the surface on.
-     * ScreenFromQWindow (the default) reads QWindow::screen() while ScreenFromCompositor
-     * passes nil and lets the compositor decide.
-     */
-    LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Use wantsToBeOnActiveScreen and screen instead")
-    enum ScreenConfiguration {
-        ScreenFromQWindow = 0,
-        ScreenFromCompositor = 1,
-    };
-    Q_ENUM(ScreenConfiguration)
-
-    LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Use wantsToBeOnActiveScreen and screen instead")
     void setScreenConfiguration(ScreenConfiguration screenConfiguration);
-    LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Use wantsToBeOnActiveScreen and screen instead")
     ScreenConfiguration screenConfiguration() const;
-#endif
-
-    /**
-     * Indicates whether the layer shell surface should be placed on the active screen based on @a set.
-     *
-     * The active screen depends on the compositor policies.
-     *
-     * If the screen() is @c null and the wantsToBeOnActiveScreen() is @c false, then the
-     * QWindow::screen() will be used to decide what screen the layer shell surface should be placed on.
-     *
-     * The screen() will be reset if @a set is @c true.
-     */
-    void setWantsToBeOnActiveScreen(bool set);
-    bool wantsToBeOnActiveScreen() const;
-
-    /**
-     * Indicates that the layer shell surface should be placed on the specified @a screen.
-     *
-     * If the screen() is @c null and the wantsToBeOnActiveScreen() is @c false, then the
-     * QWindow::screen() will be used to decide what screen the layer shell surface should be placed on.
-     *
-     * The wantsToBeOnActiveScreen() will be reset to @c false after calling this function.
-     */
-    void setScreen(QScreen *screen);
-    QScreen *screen() const;
 
     /**
      * Sets a string based identifier for this window.
@@ -171,8 +138,6 @@ public:
 
     static Window *qmlAttachedProperties(QObject *object);
 
-    bool eventFilter(QObject *watched, QEvent *event) override;
-
 Q_SIGNALS:
     void anchorsChanged();
     void exclusionZoneChanged();
@@ -181,12 +146,8 @@ Q_SIGNALS:
     void desiredSizeChanged();
     void keyboardInteractivityChanged();
     void layerChanged();
-    void wantsToBeOnActiveScreenChanged();
-    void screenChanged();
 
 private:
-    void initializeShell();
-
     Window(QWindow *window);
     QScopedPointer<WindowPrivate> d;
 };

src/qwaylandlayersurface.cpp

@@ -10,7 +10,6 @@
 #include "qwaylandlayersurface_p.h"
 #include "qwaylandxdgactivationv1_p.h"
 
-#include <QtWaylandClient/private/qwaylandinputdevice_p.h>
 #include <QtWaylandClient/private/qwaylandscreen_p.h>
 #include <QtWaylandClient/private/qwaylandsurface_p.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
@@ -27,13 +26,8 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
     , m_window(window)
 {
     wl_output *output = nullptr;
-    if (!m_interface->wantsToBeOnActiveScreen()) {
-        QScreen *desiredScreen = m_interface->screen();
-        if (!desiredScreen) {
-            desiredScreen = window->window()->screen();
-        }
-
-        auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(desiredScreen->handle());
+    if (m_interface->screenConfiguration() == Window::ScreenFromQWindow) {
+        auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(window->window()->screen()->handle());
         // Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created
         // this will not cast to a QWaylandScreen
         if (!waylandScreen) {
@@ -130,7 +124,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)
@@ -181,12 +181,25 @@ 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) {
+        return;
+    }
+
+    if (m_interface->desiredSize().isNull()) {
+        setDesiredSize(geometry.size());
+    }
+}
+#else
 void QWaylandLayerSurface::setWindowSize(const QSize &size)
 {
     if (m_interface->desiredSize().isNull()) {
         setDesiredSize(size);
     }
 }
+#endif
 
 bool QWaylandLayerSurface::requestActivate()
 {
@@ -206,7 +219,7 @@ bool QWaylandLayerSurface::requestActivate()
         const auto focusWindow = QGuiApplication::focusWindow();
         const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
         if (const auto seat = wlWindow->display()->lastInputDevice()) {
-            const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString());
+            const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), 0, QString());
             connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {
                 m_shell->activation()->activate(token, window()->wlSurface());
             });
@@ -255,6 +268,13 @@ void QWaylandLayerSurface::requestXdgActivationToken(quint32 serial)
 
 void QWaylandLayerSurface::sendExpose()
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+    window()->handleExpose(QRect(QPoint(), m_pendingSize));
+#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;
     bool requestActivateOnShow() override;
@@ -62,6 +66,9 @@ private:
     QString m_activationToken;
 
     bool m_configured = false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+    bool m_configuring = false;
+#endif
 };
 
 }

tests/become-layershell.qml

@@ -1,42 +0,0 @@
-/*
- *   SPDX-FileCopyrightText: 2025 Aleix Pol i Gonzalez <aleixpol@kde.org>
- *
- *   SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
-import QtQuick
-import QtQuick.Controls
-import org.kde.layershell 1.0 as LayerShell
-
-Item
-{
-    Button {
-        text: "Convert"
-        anchors.centerIn: parent
-
-        onClicked: {
-            win.close()
-            win.LayerShell.Window.anchors = LayerShell.Window.AnchorLeft;
-            win.LayerShell.Window.layer = LayerShell.Window.LayerTop;
-            win.LayerShell.Window.exclusionZone = -1;
-            win.show()
-        }
-    }
-
-    Window {
-        id: win
-
-        width: 100
-        height: 100
-        Rectangle {
-            anchors.fill: parent
-            color: "red"
-
-            Text {
-                anchors.centerIn: parent
-                text: "top"
-            }
-        }
-        visible: true
-    }
-}