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

Aaron skipped a bit when removing geometry() and setGeometry() so the layout was broken

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=746969
This commit is contained in:
Ivan Čukić 2007-12-10 19:04:16 +00:00
parent 5f7c078705
commit f6b097db82
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layouts/nodelayout.cpp
View File

@ -21,6 +21,7 @@
#include <QPair>
#include <QMap>
#include <KDebug>
namespace Plasma
{
@ -66,9 +67,14 @@ NodeLayout::NodeCoordinate NodeLayout::NodeCoordinate::simple(qreal x, qreal y,
class NodeLayout::Private {
public:
QMap <LayoutItem * , QPair < NodeCoordinate, NodeCoordinate > > items;
QRectF geometry;
//QRectF geometry;
NodeLayout * parent;
QSizeF sizeHint;
Private(NodeLayout * parentLayout) {
parent = parentLayout;
}
qreal calculateXPosition(const NodeCoordinate & coo, const QRectF & parentGeometry) const
{
return parentGeometry.left() + (coo.xr * parentGeometry.width()) + coo.xa;
@ -84,15 +90,17 @@ public:
Q_UNUSED( parentGeometry );
return QPointF(
calculateXPosition(coo, geometry),
calculateYPosition(coo, geometry)
calculateXPosition(coo, parent->geometry()),
calculateYPosition(coo, parent->geometry())
);
}
QRectF calculateRectangle(LayoutItem * item, QRectF geometry = QRectF()) const
{
if (geometry == QRectF()) geometry = this->geometry;
kDebug() << " enter geom is " << geometry << " \n";
if (geometry == QRectF()) geometry = parent->geometry();
QRectF result;
if (!item || !items.contains(item)) return QRectF();
@ -113,6 +121,8 @@ public:
result.moveTop(result.top() - items[item].second.yr * result.height());
}
kDebug() << " leave \n";
return result;
}
@ -146,7 +156,7 @@ public:
NodeLayout::NodeLayout(LayoutItem * parent)
: Layout(parent), d(new Private())
: Layout(parent), d(new Private(this))
{
}
@ -162,8 +172,11 @@ Qt::Orientations NodeLayout::expandingDirections() const
void NodeLayout::relayout()
{
kDebug() << " RELAYUOT ... \n";
foreach (LayoutItem * item, d->items.keys()) {
if (item) {
kDebug() << " aaRELAYUOT ..." << d->calculateRectangle(item) << "\n";
item->setGeometry(d->calculateRectangle(item));
}
}