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

the Qt idiom is that out parameters are pointers

Browse source
This commit is contained in:
Luboš Luňák 2011-09-29 15:17:59 +02:00
parent 38d760c960
commit ede01e1702
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -569,7 +569,7 @@ private:
Time readUserCreationTime() const;
void startupIdChanged();
void checkOffscreenPosition (QRect& geom, const QRect& screenArea);
void checkOffscreenPosition (QRect* geom, const QRect& screenArea);
Window client;
Window wrapper;

14
geometry.cpp
View file

@ -1036,7 +1036,7 @@ void Client::checkWorkspacePosition(const QRect &geo)
changeMaximize(false, false, true); // adjust size
const QRect &screenArea = workspace()->clientArea(ScreenArea, this);
QRect geom = geometry();
checkOffscreenPosition(geom, screenArea);
checkOffscreenPosition(&geom, screenArea);
setGeometry(geom);
return;
}
@ -1161,7 +1161,7 @@ void Client::checkWorkspacePosition(const QRect &geo)
newGeom.x() + newGeom.width() - 1));
}
checkOffscreenPosition(newGeom, screenArea);
checkOffscreenPosition(&newGeom, screenArea);
// Obey size hints. TODO: We really should make sure it stays in the right place
newGeom.setSize(adjustedSize(newGeom.size()));
@ -1170,15 +1170,15 @@ void Client::checkWorkspacePosition(const QRect &geo)
}
}
void Client::checkOffscreenPosition(QRect& geom, const QRect& screenArea)
void Client::checkOffscreenPosition(QRect* geom, const QRect& screenArea)
{
if (geom.x() > screenArea.right()) {
if (geom->x() > screenArea.right()) {
int screenWidth = screenArea.width();
geom.moveLeft(screenWidth - (screenWidth / 4));
geom->moveLeft(screenWidth - (screenWidth / 4));
}
if (geom.y() > screenArea.bottom()) {
if (geom->y() > screenArea.bottom()) {
int screenHeight = screenArea.height();
geom.moveBottom(screenHeight - (screenHeight / 4));
geom->moveBottom(screenHeight - (screenHeight / 4));
}
}