mirror/layer-shell-qt
1
0
Fork 0
mirror of https://invent.kde.org/plasma/layer-shell-qt.git synced 2025-05-28 02:50:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

use m_interface->desiredSize() validity to decide the direction

Browse Source
This commit is contained in:
Marco Martin 2025-04-30 15:24:47 +02:00
parent 71a4fde017
commit 2f89957fac
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/window.cpp
View File

@ -32,7 +32,7 @@ public:
Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand; Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand;
Window::Layer layer = Window::LayerTop; Window::Layer layer = Window::LayerTop;
QMargins margins; QMargins margins;
QSize desiredSize; QSize desiredSize = QSize(0, 0);
Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow; Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
bool closeOnDismissed = true; bool closeOnDismissed = true;
}; };

17
src/qwaylandlayersurface.cpp
View File

@ -44,10 +44,10 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
setAnchor(m_interface->anchors()); setAnchor(m_interface->anchors());
connect(m_interface, &Window::anchorsChanged, this, [this]() { connect(m_interface, &Window::anchorsChanged, this, [this]() {
setAnchor(m_interface->anchors()); setAnchor(m_interface->anchors());
if (m_explicitDesiredSize) { if (m_interface->desiredSize().isNull()) {
setDesiredSize(m_interface->desiredSize());
} else {
setDesiredSize(m_window->windowContentGeometry().size()); setDesiredSize(m_window->windowContentGeometry().size());
} else {
setDesiredSize(m_interface->desiredSize());
} }
}); });
@ -66,8 +66,9 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
}); });
connect(m_interface, &Window::desiredSizeChanged, this, [this]() { connect(m_interface, &Window::desiredSizeChanged, this, [this]() {
m_explicitDesiredSize = true; if (!m_interface->desiredSize().isNull()) {
setDesiredSize(m_interface->desiredSize()); setDesiredSize(m_interface->desiredSize());
}
}); });
setKeyboardInteractivity(m_interface->keyboardInteractivity()); setKeyboardInteractivity(m_interface->keyboardInteractivity());
@ -75,8 +76,10 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
setKeyboardInteractivity(m_interface->keyboardInteractivity()); setKeyboardInteractivity(m_interface->keyboardInteractivity());
}); });
if (!m_explicitDesiredSize) { if (m_interface->desiredSize().isNull()) {
setDesiredSize(window->windowContentGeometry().size()); setDesiredSize(window->windowContentGeometry().size());
} else {
setDesiredSize(m_interface->desiredSize());
} }
} }
@ -185,7 +188,7 @@ void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
return; return;
} }
if (!m_explicitDesiredSize) { if (m_interface->desiredSize().isNull()) {
setDesiredSize(geometry.size()); setDesiredSize(geometry.size());
} }
} }

1
src/qwaylandlayersurface_p.h
View File

@ -64,7 +64,6 @@ private:
QSize m_pendingSize; QSize m_pendingSize;
QString m_activationToken; QString m_activationToken;
bool m_explicitDesiredSize = false;
bool m_configured = false; bool m_configured = false;
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
bool m_configuring = false; bool m_configuring = false;