Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.2:Rings:1-MinimalX
libqt5-qtwayland
0004-Client-Don-t-send-fake-SurfaceCreated-Dest...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0004-Client-Don-t-send-fake-SurfaceCreated-Destroyed-even.patch of Package libqt5-qtwayland
From 8e5a54617c2841881120e0b3984d8fccf7b87925 Mon Sep 17 00:00:00 2001 From: David Edmundson <davidedmundson@kde.org> Date: Sun, 23 Jun 2019 15:09:51 +0200 Subject: [PATCH 4/5] Client: Don't send fake SurfaceCreated/Destroyed events QPlatformSurface relates to the backing store. Not the wl_surface. They are emitted by QPlatformWindow. Due to a previously incorrect usage by KDE developers it was faked to emit the events when the wl_surface is created/hidden to keep behavior. With QtBase a9246c7132a2c8864d3ae6cebd260bb9ee711fcb this now causes an issue as now QWidgets react to this event in a breaking way. Change-Id: I2f003bc9da85f032a0053677fd281152099fc9eb --- .../custom-extension/client-common/customextension.cpp | 9 +++++++-- src/client/qwaylandwindow.cpp | 10 ++-------- src/client/qwaylandwindow_p.h | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/wayland/custom-extension/client-common/customextension.cpp b/examples/wayland/custom-extension/client-common/customextension.cpp index aa0cb58..16f18fd 100644 --- a/examples/wayland/custom-extension/client-common/customextension.cpp +++ b/examples/wayland/custom-extension/client-common/customextension.cpp @@ -81,8 +81,13 @@ QWindow *CustomExtension::windowForSurface(struct ::wl_surface *surface) bool CustomExtension::eventFilter(QObject *object, QEvent *event) { - if (event->type() == QEvent::PlatformSurface - && static_cast<QPlatformSurfaceEvent*>(event)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) { + if (event->type() == QEvent::Expose) { + auto ee = static_cast<QExposeEvent*>(event); + + if ((ee->region().isNull())) { + return false; + } + QWindow *window = qobject_cast<QWindow*>(object); Q_ASSERT(window); window->removeEventFilter(this); diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index f82898b..e2d08b3 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -98,7 +98,7 @@ QWaylandWindow::~QWaylandWindow() delete mWindowDecoration; if (isInitialized()) - reset(false); + reset(); QList<QWaylandInputDevice *> inputDevices = mDisplay->inputDevices(); for (int i = 0; i < inputDevices.size(); ++i) @@ -128,8 +128,6 @@ void QWaylandWindow::initWindow() if (!isInitialized()) { initializeWlSurface(); - QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceCreated); - QGuiApplication::sendEvent(window(), &e); } if (shouldCreateSubSurface()) { @@ -240,12 +238,8 @@ bool QWaylandWindow::shouldCreateSubSurface() const return QPlatformWindow::parent() != nullptr; } -void QWaylandWindow::reset(bool sendDestroyEvent) +void QWaylandWindow::reset() { - if (isInitialized() && sendDestroyEvent) { - QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed); - QGuiApplication::sendEvent(window(), &e); - } delete mShellSurface; mShellSurface = nullptr; delete mSubSurfaceWindow; diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 7177099..c82aa8d 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -261,7 +261,7 @@ private: void initializeWlSurface(); bool shouldCreateShellSurface() const; bool shouldCreateSubSurface() const; - void reset(bool sendDestroyEvent = true); + void reset(); void sendExposeEvent(const QRect &rect); static void closePopups(QWaylandWindow *parent); QWaylandScreen *calculateScreenFromSurfaceEvents() const;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor