[wayland] Obey m_requestGeometryBlockCounter inside updateDecoration

Otherwise we can send our configure request too early

Reviewed-by: Bhushun Shah
This commit is contained in:
David Edmundson 2019-06-22 17:13:43 +02:00
parent 02babfa36e
commit bc97232dfd

View file

@ -591,8 +591,10 @@ void ShellClient::updateDecoration(bool check_workspace_pos, bool force)
if (m_xdgDecoration) { if (m_xdgDecoration) {
auto mode = isDecorated() || m_userNoBorder ? XdgDecorationInterface::Mode::ServerSide: XdgDecorationInterface::Mode::ClientSide; auto mode = isDecorated() || m_userNoBorder ? XdgDecorationInterface::Mode::ServerSide: XdgDecorationInterface::Mode::ClientSide;
m_xdgDecoration->configure(mode); m_xdgDecoration->configure(mode);
if (m_requestGeometryBlockCounter == 0) {
m_xdgShellSurface->configure(xdgSurfaceStates(), m_requestedClientSize); m_xdgShellSurface->configure(xdgSurfaceStates(), m_requestedClientSize);
} }
}
getShadow(); getShadow();
if (check_workspace_pos) if (check_workspace_pos)
checkWorkspacePosition(oldgeom, -2, oldClientGeom); checkWorkspacePosition(oldgeom, -2, oldClientGeom);