aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-02-25 03:43:58 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

wayland/lock: support Qt 6.10

Browse source
This commit is contained in:
outfoxxed 2025-10-04 12:36:28 -07:00
parent 9662234759
commit 3bcc1993f4
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
4 changed files with 45 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/wayland/session_lock/surface.cpp
View file

@ -48,16 +48,6 @@ void QSWaylandSessionLockSurface::applyConfigure() {
this->window()->resizeFromApplyConfigure(this->size);
}
bool QSWaylandSessionLockSurface::handleExpose(const QRegion& region) {
if (this->initBuf != nullptr) {
// at this point qt's next commit to the surface will have a new buffer, and we can safely delete this one.
delete this->initBuf;
this->initBuf = nullptr;
}
return this->QtWaylandClient::QWaylandShellSurface::handleExpose(region);
}
void QSWaylandSessionLockSurface::setExtension(LockWindowExtension* ext) {
if (ext == nullptr) {
if (this->window() != nullptr) this->window()->window()->close();
@ -71,11 +61,6 @@ void QSWaylandSessionLockSurface::setExtension(LockWindowExtension* ext) {
}
}
void QSWaylandSessionLockSurface::setVisible() {
if (this->configured && !this->visible) this->initVisible();
this->visible = true;
}
void QSWaylandSessionLockSurface::ext_session_lock_surface_v1_configure(
quint32 serial,
quint32 width,
@ -97,13 +82,41 @@ void QSWaylandSessionLockSurface::ext_session_lock_surface_v1_configure(
#else
this->window()->updateExposure();
#endif
#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
if (this->visible) this->initVisible();
#endif
} else {
// applyConfigureWhenPossible runs too late and causes a protocol error on reconfigure.
this->window()->resizeFromApplyConfigure(this->size);
}
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
bool QSWaylandSessionLockSurface::commitSurfaceRole() const { return false; }
void QSWaylandSessionLockSurface::setVisible() { this->window()->window()->setVisible(true); }
#else
bool QSWaylandSessionLockSurface::handleExpose(const QRegion& region) {
if (this->initBuf != nullptr) {
// at this point qt's next commit to the surface will have a new buffer, and we can safely delete this one.
delete this->initBuf;
this->initBuf = nullptr;
}
return this->QtWaylandClient::QWaylandShellSurface::handleExpose(region);
}
void QSWaylandSessionLockSurface::setVisible() {
if (this->configured && !this->visible) this->initVisible();
this->visible = true;
}
#endif
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
#include <private/qwaylandshmbackingstore_p.h>
@ -123,7 +136,7 @@ void QSWaylandSessionLockSurface::initVisible() {
this->window()->window()->setVisible(true);
}
#else
#elif QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
#include <cmath>