kosslan/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

wayland: fix Qt 6.7 compatibility

Browse source
This commit is contained in:
outfoxxed 2024-04-12 01:21:26 -07:00
parent 98318c4dcb
commit fd5b73adbb
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include <private/qwaylandwindow_p.h> #include <private/qwaylandwindow_p.h>
#include <qlogging.h> #include <qlogging.h>
#include <qobject.h> #include <qobject.h>
#include <qtversionchecks.h>
#include <qtypes.h> #include <qtypes.h>
#include "lock.hpp" #include "lock.hpp"
@ -88,7 +89,11 @@ void QSWaylandSessionLockSurface::ext_session_lock_surface_v1_configure(
this->configured = true; this->configured = true;
this->window()->resizeFromApplyConfigure(this->size); this->window()->resizeFromApplyConfigure(this->size);
#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
this->window()->handleExpose(QRect(QPoint(), this->size)); this->window()->handleExpose(QRect(QPoint(), this->size));
#else
this->window()->sendRecursiveExposeEvent();
#endif
if (this->visible) this->initVisible(); if (this->visible) this->initVisible();
} else { } else {
// applyConfigureWhenPossible runs too late and causes a protocol error on reconfigure. // applyConfigureWhenPossible runs too late and causes a protocol error on reconfigure.

5
src/wayland/wlr_layershell/surface.cpp
View file

@ -10,6 +10,7 @@
#include <qpoint.h> #include <qpoint.h>
#include <qrect.h> #include <qrect.h>
#include <qsize.h> #include <qsize.h>
#include <qtversionchecks.h>
#include <qtypes.h> #include <qtypes.h>
#include <qwayland-wlr-layer-shell-unstable-v1.h> #include <qwayland-wlr-layer-shell-unstable-v1.h>
@ -86,7 +87,11 @@ void QSWaylandLayerSurface::zwlr_layer_surface_v1_configure(
if (!this->configured) { if (!this->configured) {
this->configured = true; this->configured = true;
this->window()->resizeFromApplyConfigure(this->size); this->window()->resizeFromApplyConfigure(this->size);
#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
this->window()->handleExpose(QRect(QPoint(), this->size)); this->window()->handleExpose(QRect(QPoint(), this->size));
#else
this->window()->sendRecursiveExposeEvent();
#endif
} else { } else {
this->window()->applyConfigureWhenPossible(); this->window()->applyConfigureWhenPossible();
} }