alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a sensible default position for non-panel containments

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1118043
This commit is contained in:
Aaron J. Seigo 2010-04-23 18:23:53 +00:00
parent 2375cd6ce8
commit 644859eec4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
containment.cpp
View File

@ -340,12 +340,13 @@ void Containment::restore(KConfigGroup &group)
if (geo.size() != geo.size().boundedTo(maximumSize())) {
setMaximumSize(maximumSize().expandedTo(geo.size()));
}
if (geo.size() != geo.size().expandedTo(minimumSize())) {
setMinimumSize(minimumSize().boundedTo(geo.size()));
}
setGeometry(geo);
resize(geo.size());
//are we an offscreen containment?
if (containmentType() != PanelContainment && containmentType() != CustomPanelContainment && geo.right() < 0) {
corona()->addOffscreenWidget(this);
@ -2344,13 +2345,19 @@ QPointF ContainmentPrivate::preferredPos(Corona *corona) const
Q_ASSERT(corona);
if (isPanelContainment()) {
kDebug() << "is a panel, so let's do it at" << preferredPanelPos(corona);
//kDebug() << "is a panel, so put it at" << preferredPanelPos(corona);
return preferredPanelPos(corona);
}
// FIXME
kDebug() << "not a panel";
return QPointF(0, 0);
int width = q->size().width();
QPointF pos(0, 0);
QTransform t;
while (corona->itemAt(pos, t)) {
pos.setX(pos.x() + width);
}
//kDebug() << "not a panel, put it at" << pos;
return pos;
}
QPointF ContainmentPrivate::preferredPanelPos(Corona *corona) const