Merge branch 'Plasma/5.4'

This commit is contained in:
Martin Gräßlin 2015-09-08 08:42:07 +02:00
commit f6f555d688

View file

@ -1004,6 +1004,11 @@ void Client::leaveNotifyEvent(xcb_leave_notify_event_t *e)
shadeHoverTimer->setSingleShot(true);
shadeHoverTimer->start(options->shadeHoverInterval());
}
if (m_decoration) {
// sending a move instead of a leave. With leave we need to send proper coords, with move it's handled internally
QHoverEvent leaveEvent(QEvent::HoverMove, QPointF(-1, -1), QPointF(-1, -1), Qt::NoModifier);
QCoreApplication::sendEvent(m_decoration, &leaveEvent);
}
}
if (options->focusPolicy() == Options::FocusStrictlyUnderMouse && isActive() && lostMouse) {
workspace()->requestDelayFocus(0);
@ -1341,7 +1346,7 @@ void Client::checkQuickTilingMaximizationZones(int xroot, int yroot)
// return value matters only when filtering events before decoration gets them
bool Client::motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_root, int y_root)
{
if (w == frameId() && m_decoration) {
if (w == frameId() && m_decoration && !isMinimized()) {
// TODO Mouse move event dependent on state
QHoverEvent event(QEvent::HoverMove, QPointF(x, y), QPointF(x, y));
QCoreApplication::instance()->sendEvent(m_decoration, &event);