yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix window postition on varying screen struts better

Browse source 
BUG: 301805
CCBUG: 274466
FIXED-IN: 4.9
This commit is contained in:
Thomas Lübking 2012-06-13 19:38:27 +02:00
parent f305f0eee4
commit f9d681a3ba
1 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
geometry.cpp
View file

@ -2497,7 +2497,7 @@ void Client::positionGeometryTip()
geometryTip->raise(); geometryTip->raise();
} }
} }
static int s_lastScreen = 0;
bool Client::startMoveResize() bool Client::startMoveResize()
{ {
assert(!moveResizeMode); assert(!moveResizeMode);
@ -2559,7 +2559,6 @@ bool Client::startMoveResize()
} }
s_haveResizeEffect = effects && static_cast<EffectsHandlerImpl*>(effects)->provides(Effect::Resize); s_haveResizeEffect = effects && static_cast<EffectsHandlerImpl*>(effects)->provides(Effect::Resize);
s_lastScreen = moveResizeStartScreen = screen();
initialMoveResizeGeom = moveResizeGeom = geometry(); initialMoveResizeGeom = moveResizeGeom = geometry();
checkUnrestrictedMoveResize(); checkUnrestrictedMoveResize();
Notify::raise(isResize() ? Notify::ResizeStart : Notify::MoveStart); Notify::raise(isResize() ? Notify::ResizeStart : Notify::MoveStart);
@ -2990,13 +2989,13 @@ void Client::handleMoveResize(int x, int y, int x_root, int y_root)
if (!unrestrictedMoveResize) { if (!unrestrictedMoveResize) {
// Make sure the titlebar isn't behind a restricted area. // Make sure the titlebar isn't behind a restricted area.
const QRegion fullArea = workspace()->clientArea(ScreenArea, s_lastScreen, 0); // On the screen const QRegion fullArea = workspace()->clientArea(FullArea, this); // On the screen
const QRegion moveArea = workspace()->restrictedMoveArea(desktop()); // Strut areas const QRegion strut = workspace()->restrictedMoveArea(desktop()); // Strut areas
for (;;) { for (;;) {
QRegion titlebarRegion(moveResizeGeom.left(), moveResizeGeom.top(), QRegion titlebarRegion(moveResizeGeom.left(), moveResizeGeom.top(),
moveResizeGeom.width(), frameTop); moveResizeGeom.width(), frameTop);
titlebarRegion &= fullArea; titlebarRegion &= fullArea;
titlebarRegion -= moveArea; // Strut areas titlebarRegion -= strut; // Strut areas
// Now we have a region of all the visible areas of the titlebar // Now we have a region of all the visible areas of the titlebar
// Count the visible pixels and check to see if it's enough // Count the visible pixels and check to see if it's enough
int visiblePixels = 0; int visiblePixels = 0;
@ -3006,6 +3005,31 @@ void Client::handleMoveResize(int x, int y, int x_root, int y_root)
if (visiblePixels >= titlebarArea) if (visiblePixels >= titlebarArea)
break; // We have reached a valid position break; // We have reached a valid position
// (esp.) if there're more screens with different struts (panels) it the titlebar
// will be movable outside the movearea (covering one of the panels) until it
// crosses the panel "too much" (not enough visiblePixels) and then stucks because
// it's usually only pushed by 1px to either direction
// so we first check whether we intersect suc strut and move the window below it
// immediately (it's still possible to hit the visiblePixels >= titlebarArea break
// by moving the window slightly downwards, but it won't stuck)
// see bug #274466
// and bug #301805 for why we can't just match the titlearea against the screen
if (QApplication::desktop()->screenCount() > 1) { // optimization
// TODO: could be useful on partial screen struts (half-width panels etc.)
int newTitleTop = -1;
foreach (const QRect &r, strut.rects()) {
if (r.top() == 0 && r.width() > r.height() && // "top panel"
r.intersects(moveResizeGeom) && moveResizeGeom.top() < r.bottom()) {
newTitleTop = r.bottom();
break;
}
}
if (newTitleTop > -1) {
moveResizeGeom.moveTop(newTitleTop); // invalid position, possibly on screen change
break;
}
}
// Move it (Favour vertically) // Move it (Favour vertically)
if (previousMoveResizeGeom.y() != moveResizeGeom.y()) if (previousMoveResizeGeom.y() != moveResizeGeom.y())
moveResizeGeom.translate(0, moveResizeGeom.translate(0,
@ -3013,27 +3037,14 @@ void Client::handleMoveResize(int x, int y, int x_root, int y_root)
else else
moveResizeGeom.translate(previousMoveResizeGeom.x() > moveResizeGeom.x() ? 1 : -1, moveResizeGeom.translate(previousMoveResizeGeom.x() > moveResizeGeom.x() ? 1 : -1,
0); 0);
if (moveResizeGeom == previousMoveResizeGeom) if (moveResizeGeom == previousMoveResizeGeom) {
break; // Prevent lockup break; // Prevent lockup
} }
} }
} }
if (moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft())
update = true;
else if (screen() != s_lastScreen) { // invalid position on screen change?
s_lastScreen = screen();
const QRect area = workspace()->clientArea(WorkArea, s_lastScreen, desktop());
if (moveResizeGeom.bottom() > area.bottom())
moveResizeGeom.moveBottom(area.bottom());
if (moveResizeGeom.right() > area.right())
moveResizeGeom.moveRight(area.right());
if (moveResizeGeom.top() < area.top())
moveResizeGeom.moveTop(area.top());
if (moveResizeGeom.left() < area.left())
moveResizeGeom.moveLeft(area.left());
if (moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft())
update = true;
} }
if (moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft())
update = true;
} else } else
abort(); abort();