Cleanup electric border handling in leaveMoveResize

If a Client closed during move/resize with the outline being shown
for quick tile/maximize area, the outline never got removed.

BUG: 341673
FIXED-IN: 5.1.2
REVIEW: 121410
This commit is contained in:
Martin Gräßlin 2014-12-09 17:27:32 +01:00
parent 3f346a23ba
commit d6014927e7

View file

@ -2632,8 +2632,6 @@ void Client::finishMoveResize(bool cancel)
if (isElectricBorderMaximizing()) { if (isElectricBorderMaximizing()) {
setQuickTileMode(electricMode); setQuickTileMode(electricMode);
electricMaximizing = false; electricMaximizing = false;
outline()->hide();
elevate(false);
} else if (!cancel) { } else if (!cancel) {
if (!(maximizeMode() & MaximizeHorizontal)) { if (!(maximizeMode() & MaximizeHorizontal)) {
geom_restore.setX(geometry().x()); geom_restore.setX(geometry().x());
@ -2678,6 +2676,10 @@ void Client::leaveMoveResize()
if (ScreenEdges::self()->isDesktopSwitchingMovingClients()) if (ScreenEdges::self()->isDesktopSwitchingMovingClients())
ScreenEdges::self()->reserveDesktopSwitching(false, Qt::Vertical|Qt::Horizontal); ScreenEdges::self()->reserveDesktopSwitching(false, Qt::Vertical|Qt::Horizontal);
#endif #endif
if (isElectricBorderMaximizing()) {
outline()->hide();
elevate(false);
}
} }
// This function checks if it actually makes sense to perform a restricted move/resize. // This function checks if it actually makes sense to perform a restricted move/resize.