Make some Window::updateInteractiveMoveResize() code less misleading
The "!isMovable()" code path is needed to handle moving fullscreen windows. Maximized windows are movable and their geometry is computed in Window::nextInteractiveMoveGeometry().
This commit is contained in:
parent
f563bade46
commit
e8ae03d799
1 changed files with 2 additions and 14 deletions
|
@ -1404,20 +1404,8 @@ void Window::updateInteractiveMoveResize(const QPointF &global)
|
||||||
Q_EMIT interactiveMoveResizeStepped(nextMoveResizeGeom);
|
Q_EMIT interactiveMoveResizeStepped(nextMoveResizeGeom);
|
||||||
}
|
}
|
||||||
} else if (isInteractiveMove()) {
|
} else if (isInteractiveMove()) {
|
||||||
if (!isMovable()) { // isMovableAcrossScreens() must have been true to get here
|
|
||||||
// Special moving of maximized windows on Xinerama screens
|
|
||||||
Output *output = workspace()->outputAt(global);
|
|
||||||
if (isRequestedFullScreen()) {
|
if (isRequestedFullScreen()) {
|
||||||
nextMoveResizeGeom = workspace()->clientArea(FullScreenArea, this, output);
|
nextMoveResizeGeom = workspace()->clientArea(FullScreenArea, this, global);
|
||||||
} else {
|
|
||||||
nextMoveResizeGeom = workspace()->clientArea(MaximizeArea, this, output);
|
|
||||||
const QSizeF adjSize = constrainFrameSize(nextMoveResizeGeom.size(), SizeModeMax);
|
|
||||||
if (adjSize != nextMoveResizeGeom.size()) {
|
|
||||||
QRectF r(nextMoveResizeGeom);
|
|
||||||
nextMoveResizeGeom.setSize(adjSize);
|
|
||||||
nextMoveResizeGeom.moveCenter(r.center());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
nextMoveResizeGeom = nextInteractiveMoveGeometry(global);
|
nextMoveResizeGeom = nextInteractiveMoveGeometry(global);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue