1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Drop ShellIntegration::handleExpose

Browse Source 
This was effectively deprecated when the virtual isExposed was added and
we moved towards a state based system.

The region of the exposed geometry is something we want to phase out and
is of no use to shells.

The other usage in XdgShell was for updating contentGeometry on first
show, but this is now an explicit call updated by QWaylandWindow
directly.

Change-Id: I09a083fcfcc69c444ca4270f425b591b046e0617
Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
This commit is contained in:
David Edmundson 2025-05-28 10:36:41 +03:00
parent 27283b02ca
commit e9eba1ef0d
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
View File

@ -410,15 +410,6 @@ bool QWaylandXdgSurface::isExposed() const
return m_configured;
}
bool QWaylandXdgSurface::handleExpose(const QRegion &region)
{
if (!isExposed() && !region.isEmpty()) {
return true;
}
setContentGeometry(window()->windowContentGeometry());
return false;
}
void QWaylandXdgSurface::applyConfigure()
{
// It is a redundant ack_configure, so skipped.
@ -451,7 +442,7 @@ void QWaylandXdgSurface::propagateSizeHints()
void QWaylandXdgSurface::setContentGeometry(const QRect &rect)
{
if (!window()->isExposed() || m_lastGeometry == rect)
if (!isExposed() || m_lastGeometry == rect)
return;
set_window_geometry(rect.x(), rect.y(), rect.width(), rect.height());

1
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
View File

@ -57,7 +57,6 @@ public:
void setWindowFlags(Qt::WindowFlags flags) override;
bool isExposed() const override;
bool handleExpose(const QRegion &) override;
bool handlesActiveState() const { return m_toplevel; }
void applyConfigure() override;
bool wantsDecorations() const override;

1
src/plugins/platforms/wayland/qwaylandshellsurface_p.h
View File

@ -51,7 +51,6 @@ public:
virtual void setWindowFlags(Qt::WindowFlags flags);
virtual bool isExposed() const { return true; }
virtual bool handleExpose(const QRegion &) { return false; }
virtual void raise() {}
virtual void lower() {}

5
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -593,11 +593,6 @@ void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, cons
void QWaylandWindow::sendExposeEvent(const QRect &rect)
{
if (mShellSurface && mShellSurface->handleExpose(rect)) {
qCDebug(lcQpaWayland) << "sendExposeEvent: intercepted by shell extension, not sending";
return;
}
static bool sQtTestMode = qEnvironmentVariableIsSet("QT_QTESTLIB_RUNNING");
mLastExposeGeometry = rect;