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

the size is either implicit or explicit

Browse Source 
if the user called setDesiredSize, it's no longer set implicitly by
QWindow::setGeometry
This commit is contained in:
Marco Martin 2025-04-30 14:32:06 +02:00
parent 5475de8b29
commit 71a4fde017
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qwaylandlayersurface.cpp
View File

@ -44,7 +44,11 @@ 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());
setDesiredSize(m_window->windowContentGeometry().size()); if (m_explicitDesiredSize) {
setDesiredSize(m_interface->desiredSize());
} else {
setDesiredSize(m_window->windowContentGeometry().size());
}
}); });
setExclusiveZone(m_interface->exclusionZone()); setExclusiveZone(m_interface->exclusionZone());
@ -62,9 +66,8 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
}); });
connect(m_interface, &Window::desiredSizeChanged, this, [this]() { connect(m_interface, &Window::desiredSizeChanged, this, [this]() {
if (!m_settingDesiredSize) { m_explicitDesiredSize = true;
setDesiredSize(m_interface->desiredSize()); setDesiredSize(m_interface->desiredSize());
}
}); });
setKeyboardInteractivity(m_interface->keyboardInteractivity()); setKeyboardInteractivity(m_interface->keyboardInteractivity());
@ -72,7 +75,9 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
setKeyboardInteractivity(m_interface->keyboardInteractivity()); setKeyboardInteractivity(m_interface->keyboardInteractivity());
}); });
setDesiredSize(window->windowContentGeometry().size()); if (!m_explicitDesiredSize) {
setDesiredSize(window->windowContentGeometry().size());
}
} }
QWaylandLayerSurface::~QWaylandLayerSurface() QWaylandLayerSurface::~QWaylandLayerSurface()
@ -127,12 +132,6 @@ void QWaylandLayerSurface::applyConfigure()
void QWaylandLayerSurface::setDesiredSize(const QSize &size) void QWaylandLayerSurface::setDesiredSize(const QSize &size)
{ {
// This guards setDesiredSize to avoid the connection between
// m_interface::desiredSizeChanged and this takes effect when
// we call m_interface->setDesiredSize from here
m_settingDesiredSize = true;
m_interface->setDesiredSize(size);
const bool horizontallyConstrained = m_interface->anchors().testFlags({Window::AnchorLeft, Window::AnchorRight}); const bool horizontallyConstrained = m_interface->anchors().testFlags({Window::AnchorLeft, Window::AnchorRight});
const bool verticallyConstrained = m_interface->anchors().testFlags({Window::AnchorTop, Window::AnchorBottom}); const bool verticallyConstrained = m_interface->anchors().testFlags({Window::AnchorTop, Window::AnchorBottom});
@ -144,7 +143,6 @@ void QWaylandLayerSurface::setDesiredSize(const QSize &size)
effectiveSize.setHeight(0); effectiveSize.setHeight(0);
} }
set_size(effectiveSize.width(), effectiveSize.height()); set_size(effectiveSize.width(), effectiveSize.height());
m_settingDesiredSize = false;
} }
void QWaylandLayerSurface::setAnchor(uint anchor) void QWaylandLayerSurface::setAnchor(uint anchor)
@ -187,12 +185,16 @@ void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
return; return;
} }
setDesiredSize(geometry.size()); if (!m_explicitDesiredSize) {
setDesiredSize(geometry.size());
}
} }
#else #else
void QWaylandLayerSurface::setWindowSize(const QSize &size) void QWaylandLayerSurface::setWindowSize(const QSize &size)
{ {
setDesiredSize(size); if (!m_explicitDesiredSize) {
setDesiredSize(size);
}
} }
#endif #endif

2
src/qwaylandlayersurface_p.h
View File

@ -64,7 +64,7 @@ private:
QSize m_pendingSize; QSize m_pendingSize;
QString m_activationToken; QString m_activationToken;
bool m_settingDesiredSize = false; 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;