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

Remove Widget::invalidate(), that is a feature which is part of the layouts. Better attempt at Widget::updateGeometry() which widget subclasses can call when their size hint or min/max size changes. Ultimately should behave like the QWidget methods of the same name. Make Widget return Qt::Horizontal | Qt::Vertical in its default implementation of expandingDirections()

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=706939
This commit is contained in:
Robert Knight 2007-08-31 15:32:10 +00:00
parent f7861353ba
commit bb25f62e55
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widgets/widget.cpp
View File

@ -80,7 +80,7 @@ Widget::Widget(QGraphicsItem *parent,QObject* parentObject)
if (d->parent) {
d->parent->addChild(this);
d->parent->invalidate();
d->parent->updateGeometry();
}
}
@ -100,7 +100,7 @@ qreal Widget::opacity() const
Qt::Orientations Widget::expandingDirections() const
{
return 0;
return Qt::Horizontal | Qt::Vertical;
}
void Widget::setMinimumSize(const QSizeF& size)
@ -168,9 +168,11 @@ void Widget::setGeometry(const QRectF& geometry)
d->size = QSizeF(width, height);
updateGeometry();
if ( layout() )
layout()->setGeometry(boundingRect());
}
setPos(geometry.topLeft());
setPos(geometry.topLeft() - boundingRect().topLeft());
update();
}
@ -179,19 +181,28 @@ void Widget::updateGeometry()
{
prepareGeometryChange();
Widget *widget = this;
while ( widget ) {
if ( widget->parent() == 0 || widget->parent()->layout() != 0 ) {
if ( widget->layout() ) {
widget->layout()->update();
widget->update();
}
break;
}
widget = widget->parent();
}
#if 0
prepareGeometryChange();
if (layout()) {
// kDebug() << (void *) this << " updating geometry to " << size();
//
//qDebug() << "Widget" << metaObject()->className() << "updating geometry to " << boundingRect();
layout()->setGeometry(boundingRect());
}
}
void Widget::invalidate()
{
updateGeometry();
if (parent()) {
parent()->updateGeometry();
}
#endif
}
QSizeF Widget::sizeHint() const

6
widgets/widget.h
View File

@ -151,12 +151,6 @@ public:
// NOTE: this is a completely broken concept -MB
Q_INVOKABLE void updateGeometry();
/**
* Invalidate current geometry of this Plasma::Widget as well as its
* parent if it exists.
*/
Q_INVOKABLE virtual void invalidate();
/**
* Returns the recommended size for this widget. Note that this size is not
* necessarily only the size for the widget, but might also include margins etc.