Update version for new release 6.4.0

Update version for new release 6.3.91
update version for new release
2025-07-14 11:04:20 -04:00 · 2025-06-12 13:31:05 +05:30 · 2025-05-29 14:24:55 +05:30 · 2025-05-15 15:14:19 +05:30 · 2025-05-15 14:20:07 +05:30 · 2025-05-15 14:20:07 +05:30
4 changed files with 45 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)

 project(layershellqt)
-set(PROJECT_VERSION "6.3.80")
+set(PROJECT_VERSION "6.4.0")
 set(PROJECT_VERSION_MAJOR 6)

 set(CMAKE_C_STANDARD 99)

-set(QT_MIN_VERSION "6.7.0")
-set(KF6_MIN_VERSION "6.10.0")
+set(QT_MIN_VERSION "6.8.0")
+set(KF6_MIN_VERSION "6.14.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")

 set(CMAKE_CXX_STANDARD 20)
--- a/src/interfaces/window.cpp
+++ b/src/interfaces/window.cpp
@ -32,6 +32,7 @@ public:
    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand;
    Window::Layer layer = Window::LayerTop;
    QMargins margins;
+    QSize desiredSize = QSize(0, 0);
    Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
    bool closeOnDismissed = true;
 };
@ -97,6 +98,21 @@ QMargins Window::margins() const
    return d->margins;
 }

+void Window::setDesiredSize(const QSize &size)
+{
+    if (size == d->desiredSize) {
+        return;
+    }
+
+    d->desiredSize = size;
+    Q_EMIT desiredSizeChanged();
+}
+
+QSize Window::desiredSize() const
+{
+    return d->desiredSize;
+}
+
 void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
 {
    if (d->keyboardInteractivity != interactivity) {
--- a/src/interfaces/window.h
+++ b/src/interfaces/window.h
@ -86,6 +86,9 @@ public:
    void setMargins(const QMargins &margins);
    QMargins margins() const;

+    void setDesiredSize(const QSize &size);
+    QSize desiredSize() const;
+
    void setKeyboardInteractivity(KeyboardInteractivity interactivity);
    KeyboardInteractivity keyboardInteractivity() const;

@ -127,6 +130,7 @@ Q_SIGNALS:
    void exclusionZoneChanged();
    void exclusiveEdgeChanged();
    void marginsChanged();
+    void desiredSizeChanged();
    void keyboardInteractivityChanged();
    void layerChanged();

--- a/src/qwaylandlayersurface.cpp
+++ b/src/qwaylandlayersurface.cpp
@ -44,7 +44,11 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
    setAnchor(m_interface->anchors());
    connect(m_interface, &Window::anchorsChanged, this, [this]() {
        setAnchor(m_interface->anchors());
-        setDesiredSize(m_window->windowContentGeometry().size());
+        if (m_interface->desiredSize().isNull()) {
+            setDesiredSize(m_window->windowContentGeometry().size());
+        } else {
+            setDesiredSize(m_interface->desiredSize());
+        }
    });

    setExclusiveZone(m_interface->exclusionZone());
@ -61,12 +65,22 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
        setMargins(m_interface->margins());
    });

+    connect(m_interface, &Window::desiredSizeChanged, this, [this]() {
+        if (!m_interface->desiredSize().isNull()) {
+            setDesiredSize(m_interface->desiredSize());
+        }
+    });
+
    setKeyboardInteractivity(m_interface->keyboardInteractivity());
    connect(m_interface, &Window::keyboardInteractivityChanged, this, [this]() {
        setKeyboardInteractivity(m_interface->keyboardInteractivity());
    });

-    setDesiredSize(window->windowContentGeometry().size());
+    if (m_interface->desiredSize().isNull()) {
+        setDesiredSize(window->windowContentGeometry().size());
+    } else {
+        setDesiredSize(m_interface->desiredSize());
+    }
 }

 QWaylandLayerSurface::~QWaylandLayerSurface()
@ -174,12 +188,16 @@ void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
        return;
    }

-    setDesiredSize(geometry.size());
+    if (m_interface->desiredSize().isNull()) {
+        setDesiredSize(geometry.size());
+    }
 }
 #else
 void QWaylandLayerSurface::setWindowSize(const QSize &size)
 {
-    setDesiredSize(size);
+    if (m_interface->desiredSize().isNull()) {
+        setDesiredSize(size);
+    }
 }
 #endif
Author	SHA1	Message	Date
Bhushan Shah	04dc6c3d37	Update version for new release 6.4.0	2025-06-12 13:31:05 +05:30
Bhushan Shah	6e9391e734	Update version for new release 6.3.91	2025-05-29 14:24:55 +05:30
Bhushan Shah	8b54edb695	update version for new release	2025-05-15 15:14:19 +05:30
Bhushan Shah	ffa33fef9f	Update Qt version requirement to 6.8.0 GIT_SILENT	2025-05-15 14:20:07 +05:30
Bhushan Shah	3522070454	Update Frameworks version requirement to 6.14.0 GIT_SILENT	2025-05-15 14:20:07 +05:30
Marco Martin	80d5e3c935	Expose setDesiredSize to the C++ API Making it possible for clients to call setDesiredSize directly, The idea is that under Wayland, the panel calls this intead of setGeometry, not trying to set an abosulute geometry that might cause the panel sized wrongly, but just sets an hint which will ensure the panel won't overlap another one used by https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/5437 CCBUG:489703	2025-04-30 17:23:48 +02:00