Merge branch 'KDE/4.10'
This commit is contained in:
commit
2742f6747f
1 changed files with 3 additions and 2 deletions
|
@ -2628,8 +2628,9 @@ void Client::finishMoveResize(bool cancel)
|
||||||
moveResizeGeom.width() != initialMoveResizeGeom.width();
|
moveResizeGeom.width() != initialMoveResizeGeom.width();
|
||||||
const bool restoreV = maximizeMode() == MaximizeVertical &&
|
const bool restoreV = maximizeMode() == MaximizeVertical &&
|
||||||
moveResizeGeom.height() != initialMoveResizeGeom.height();
|
moveResizeGeom.height() != initialMoveResizeGeom.height();
|
||||||
if (restoreH || restoreV) // NOT setMaximize(restoreH, restoreV); !
|
if (restoreH || restoreV) {
|
||||||
setMaximize(false, false);
|
changeMaximize(restoreV, restoreH, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
setGeometry(moveResizeGeom);
|
setGeometry(moveResizeGeom);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue