yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression concerning popup handling for wl_shell_surface

Browse source 
Regression introduced due to making popup a member variable and this
is not ready in the init method. So connect to the rescue.

Fixes failing PointerInputTest.
This commit is contained in:
Martin Flöser 2017-09-25 21:10:41 +02:00
parent a264c2b5cf
commit cd97c049b5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell_client.cpp
View file

@ -228,8 +228,12 @@ void ShellClient::init()
connect(s, &SurfaceInterface::destroyed, this, &ShellClient::destroyClient);
if (m_shellSurface) {
initSurface(m_shellSurface);
// TODO: verify grab serial
m_hasPopupGrab = m_shellSurface->isPopup();
auto setPopup = [this] {
// TODO: verify grab serial
m_hasPopupGrab = m_shellSurface->isPopup();
};
connect(m_shellSurface, &ShellSurfaceInterface::popupChanged, this, setPopup);
setPopup();
} else if (m_xdgShellSurface) {
initSurface(m_xdgShellSurface);