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

Client: Clarify warnings about unexpected enter/leave events

Browse Source 
With the previous wording it was a bit unclear whether this was a client
problem or not.

Also adds logging category.

Change-Id: I61084c0b2c7f17408575d1d4b6cc7809c4c6d99d
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-12-06 09:06:33 +01:00 committed by Johan Helsing
parent f6dd4ab120
commit 98b7643fdd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,9 +496,11 @@ void QWaylandWindow::surface_enter(wl_output *output)
auto addedScreen = QWaylandScreen::fromWlOutput(output); auto addedScreen = QWaylandScreen::fromWlOutput(output);
if (mScreens.contains(addedScreen)) { if (mScreens.contains(addedScreen)) {
qWarning() << "Unexpected wl_surface.enter received for output with id:" qWarning(lcQpaWayland) << "Ignoring unexpected wl_surface.enter received for output with id:"
<< wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output)) << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
<< "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model(); << "screen name:" << addedScreen->name()
<< "screen model:" << addedScreen->model()
<< "This is most likely a bug in the compositor.";
return; return;
} }
@ -515,9 +517,11 @@ void QWaylandWindow::surface_leave(wl_output *output)
auto *removedScreen = QWaylandScreen::fromWlOutput(output); auto *removedScreen = QWaylandScreen::fromWlOutput(output);
bool wasRemoved = mScreens.removeOne(removedScreen); bool wasRemoved = mScreens.removeOne(removedScreen);
if (!wasRemoved) { if (!wasRemoved) {
qWarning() << "Unexpected wl_surface.leave received for output with id:" qWarning(lcQpaWayland) << "Ignoring unexpected wl_surface.leave received for output with id:"
<< wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output)) << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
<< "screen name:" << removedScreen->name() << "screen model:" << removedScreen->model(); << "screen name:" << removedScreen->name()
<< "screen model:" << removedScreen->model()
<< "This is most likely a bug in the compositor.";
return; return;
} }