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

fix overzealous optimizations leading to dangling references to temporaries

Browse source
This commit is contained in:
Luboš Luňák 2011-09-29 17:39:04 +02:00
parent 2202be232b
commit c47de96716
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
geometry.cpp
View file

@ -1034,7 +1034,7 @@ void Client::checkWorkspacePosition(const QRect &geo)
if (maximizeMode() != MaximizeRestore) { if (maximizeMode() != MaximizeRestore) {
// TODO update geom_restore? // TODO update geom_restore?
changeMaximize(false, false, true); // adjust size changeMaximize(false, false, true); // adjust size
const QRect &screenArea = workspace()->clientArea(ScreenArea, this); const QRect screenArea = workspace()->clientArea(ScreenArea, this);
QRect geom = geometry(); QRect geom = geometry();
checkOffscreenPosition(&geom, screenArea); checkOffscreenPosition(&geom, screenArea);
setGeometry(geom); setGeometry(geom);
@ -1058,15 +1058,15 @@ void Client::checkWorkspacePosition(const QRect &geo)
// If the window was touching an edge before but not now move it so it is again. // If the window was touching an edge before but not now move it so it is again.
// Old and new maximums have different starting values so windows on the screen // Old and new maximums have different starting values so windows on the screen
// edge will move when a new strut is placed on the edge. // edge will move when a new strut is placed on the edge.
const QRect& screenArea = workspace()->clientArea(ScreenArea, this); const QRect screenArea = workspace()->clientArea(ScreenArea, this);
int oldTopMax = screenArea.y(); int oldTopMax = screenArea.y();
int oldRightMax = screenArea.x() + screenArea.width(); int oldRightMax = screenArea.x() + screenArea.width();
int oldBottomMax = screenArea.y() + screenArea.height(); int oldBottomMax = screenArea.y() + screenArea.height();
int oldLeftMax = screenArea.x(); int oldLeftMax = screenArea.x();
int topMax = INT_MIN, rightMax = INT_MAX, bottomMax = INT_MAX, leftMax = INT_MIN; int topMax = INT_MIN, rightMax = INT_MAX, bottomMax = INT_MAX, leftMax = INT_MIN;
QRect newGeom = geo.isValid() ? geo : geometry(); QRect newGeom = geo.isValid() ? geo : geometry();
const QRect& newGeomTall = QRect(newGeom.x(), 0, newGeom.width(), displayHeight()); // Full screen height const QRect newGeomTall = QRect(newGeom.x(), 0, newGeom.width(), displayHeight()); // Full screen height
const QRect& newGeomWide = QRect(0, newGeom.y(), displayWidth(), newGeom.height()); // Full screen width const QRect newGeomWide = QRect(0, newGeom.y(), displayWidth(), newGeom.height()); // Full screen width
// Get the max strut point for each side where the window is (E.g. Highest point for // Get the max strut point for each side where the window is (E.g. Highest point for
// the bottom struts bounded by the window's left and right sides). // the bottom struts bounded by the window's left and right sides).