diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp index e6ef7767768..8ac5f2d7bf4 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp @@ -410,15 +410,6 @@ bool QWaylandXdgSurface::isExposed() const return m_configured; } -bool QWaylandXdgSurface::handleExpose(const QRegion ®ion) -{ - 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()); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h index f7d223b51d0..236d34c351c 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h @@ -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; diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h index 88adb338ca3..273586a106a 100644 --- a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h +++ b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h @@ -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() {} diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 7475fe6608c..ad43fa8f124 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -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;