Skip to content

Commit e9eba1e

Browse files
wayland: Drop ShellIntegration::handleExpose
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 <[email protected]>
1 parent 27283b0 commit e9eba1e

File tree

4 files changed

+1
-17
lines changed

4 files changed

+1
-17
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -410,15 +410,6 @@ bool QWaylandXdgSurface::isExposed() const
410410
return m_configured;
411411
}
412412

413-
bool QWaylandXdgSurface::handleExpose(const QRegion &region)
414-
{
415-
if (!isExposed() && !region.isEmpty()) {
416-
return true;
417-
}
418-
setContentGeometry(window()->windowContentGeometry());
419-
return false;
420-
}
421-
422413
void QWaylandXdgSurface::applyConfigure()
423414
{
424415
// It is a redundant ack_configure, so skipped.
@@ -451,7 +442,7 @@ void QWaylandXdgSurface::propagateSizeHints()
451442

452443
void QWaylandXdgSurface::setContentGeometry(const QRect &rect)
453444
{
454-
if (!window()->isExposed() || m_lastGeometry == rect)
445+
if (!isExposed() || m_lastGeometry == rect)
455446
return;
456447

457448
set_window_geometry(rect.x(), rect.y(), rect.width(), rect.height());

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class Q_WAYLANDCLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface, p
5757
void setWindowFlags(Qt::WindowFlags flags) override;
5858

5959
bool isExposed() const override;
60-
bool handleExpose(const QRegion &) override;
6160
bool handlesActiveState() const { return m_toplevel; }
6261
void applyConfigure() override;
6362
bool wantsDecorations() const override;

src/plugins/platforms/wayland/qwaylandshellsurface_p.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class Q_WAYLANDCLIENT_EXPORT QWaylandShellSurface : public QObject
5151
virtual void setWindowFlags(Qt::WindowFlags flags);
5252

5353
virtual bool isExposed() const { return true; }
54-
virtual bool handleExpose(const QRegion &) { return false; }
5554

5655
virtual void raise() {}
5756
virtual void lower() {}

src/plugins/platforms/wayland/qwaylandwindow.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,6 @@ void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, cons
593593

594594
void QWaylandWindow::sendExposeEvent(const QRect &rect)
595595
{
596-
if (mShellSurface && mShellSurface->handleExpose(rect)) {
597-
qCDebug(lcQpaWayland) << "sendExposeEvent: intercepted by shell extension, not sending";
598-
return;
599-
}
600-
601596
static bool sQtTestMode = qEnvironmentVariableIsSet("QT_QTESTLIB_RUNNING");
602597
mLastExposeGeometry = rect;
603598

0 commit comments

Comments
 (0)