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

let's not hold on to our own parent pointer; just too easy to have it fall out of date.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=731160
This commit is contained in:
Aaron J. Seigo 2007-10-30 21:00:01 +00:00
parent fab534cf22
commit ffcf6bc16b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/widget.cpp
View File

@ -47,7 +47,6 @@ class Widget::Private
: minimumSize(0,0),
maximumSize(std::numeric_limits<qreal>::infinity(),
std::numeric_limits<qreal>::infinity()),
parent(0),
opacity(1.0),
cachePaintMode(Widget::NoCacheMode),
wasMovable(false)
@ -58,7 +57,6 @@ class Widget::Private
QSizeF minimumSize;
QSizeF maximumSize;
Widget *parent;
QList<Widget *> childList;
qreal opacity;
@ -91,7 +89,7 @@ bool Widget::Private::shouldPaint(QPainter *painter, const QTransform &transform
return true;
}
Widget::Widget(QGraphicsItem *parent,QObject* parentObject)
Widget::Widget(QGraphicsItem *parent, QObject* parentObject)
: QObject(parentObject),
QGraphicsItem(parent),
d(new Private)
@ -99,11 +97,10 @@ Widget::Widget(QGraphicsItem *parent,QObject* parentObject)
setFlag(QGraphicsItem::ItemClipsToShape, true);
setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
setCachePaintMode(DeviceCoordinateCacheMode);
d->parent = dynamic_cast<Widget *>(parent);
if (d->parent) {
d->parent->addChild(this);
d->parent->updateGeometry();
Widget *w = dynamic_cast<Widget *>(parent);
if (w) {
w->addChild(this);
}
}
@ -283,7 +280,7 @@ void Widget::resize(qreal w, qreal h)
Widget *Widget::parent() const
{
return d->parent;
return dynamic_cast<Widget *>(parentItem());
}
void Widget::addChild(Widget *w)
@ -293,15 +290,17 @@ void Widget::addChild(Widget *w)
}
d->childList.append(w);
w->d->parent = this;
w->setParentItem(this);
//kDebug() << "Added Child Widget" << w;
if (layout()) {
layout()->addItem(w);
updateGeometry();
}
updateGeometry();
//TODO: is this necessary?
w->update();
}