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

Client: Don't send fake SurfaceCreated/Destroyed events

Browse Source 
QPlatformSurface relates to the platform window, not the wl_surface.
The events are already emitted by QPlatformWindow on create/destroy.

To preserve compatibility for a previous KDE version it was faked to
emit the events when the wl_surface is created/hidden to keep behavior.
This is no longer necessary, and it has caused multiple errors, the latest
being a crash when switching between sub-menus with the Sway compositor.

[ChangeLog][QPA plugin] QWaylandWindow no longer sends fake SurfaceCreated/Destroyed events.
Use expose events to be notified when a Wayland surface appears.

Task-number: QTBUG-76324
Fixes: QTBUG-81952
Pick-to: 5.15
Change-Id: I2f003bc9da85f032a0053677fd281152099fc9eb
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Edmundson 2019-06-23 15:09:51 +02:00 committed by Paul Olav Tvete
parent 58b9cfd916
commit 1a7dedc2d1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ QWaylandWindow::~QWaylandWindow()
delete mWindowDecoration; delete mWindowDecoration;
if (mSurface) if (mSurface)
reset(false); reset();
const QWindow *parent = window(); const QWindow *parent = window();
const auto tlw = QGuiApplication::topLevelWindows(); const auto tlw = QGuiApplication::topLevelWindows();
@ -118,8 +118,6 @@ void QWaylandWindow::initWindow()
if (!mSurface) { if (!mSurface) {
initializeWlSurface(); initializeWlSurface();
QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceCreated);
QGuiApplication::sendEvent(window(), &e);
} }
if (shouldCreateSubSurface()) { if (shouldCreateSubSurface()) {
@ -234,12 +232,8 @@ bool QWaylandWindow::shouldCreateSubSurface() const
return QPlatformWindow::parent() != nullptr; return QPlatformWindow::parent() != nullptr;
} }
void QWaylandWindow::reset(bool sendDestroyEvent) void QWaylandWindow::reset()
{ {
if (mSurface && sendDestroyEvent) {
QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed);
QGuiApplication::sendEvent(window(), &e);
}
delete mShellSurface; delete mShellSurface;
mShellSurface = nullptr; mShellSurface = nullptr;
delete mSubSurfaceWindow; delete mSubSurfaceWindow;

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -260,7 +260,7 @@ private:
void initializeWlSurface(); void initializeWlSurface();
bool shouldCreateShellSurface() const; bool shouldCreateShellSurface() const;
bool shouldCreateSubSurface() const; bool shouldCreateSubSurface() const;
void reset(bool sendDestroyEvent = true); void reset();
void sendExposeEvent(const QRect &rect); void sendExposeEvent(const QRect &rect);
static void closePopups(QWaylandWindow *parent); static void closePopups(QWaylandWindow *parent);
QPlatformScreen *calculateScreenFromSurfaceEvents() const; QPlatformScreen *calculateScreenFromSurfaceEvents() const;