Merge branch 'Plasma/5.2'

This commit is contained in:
Martin Gräßlin 2015-02-06 09:41:15 +01:00
commit 45519677b2

View file

@ -690,6 +690,8 @@ void EffectsHandlerImpl::startMouseInterception(Effect *effect, Qt::CursorShape
Cursor::x11Cursor(shape) Cursor::x11Cursor(shape)
}; };
m_mouseInterceptionWindow.reset(Xcb::createInputWindow(geo, mask, values)); m_mouseInterceptionWindow.reset(Xcb::createInputWindow(geo, mask, values));
} else {
defineCursor(shape);
} }
m_mouseInterceptionWindow.map(); m_mouseInterceptionWindow.map();
m_mouseInterceptionWindow.raise(); m_mouseInterceptionWindow.raise();