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

Support setting QGraphicsItems in ExtenderItem as discussed in the extender api review

Browse Source 
discussion on the mailing list.


svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=862687
This commit is contained in:
Rob Scheepmaker 2008-09-19 16:23:08 +00:00
parent 8d1e6cdf85
commit 1f7f9b95ed
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
extenderitem.cpp
View File

@ -225,7 +225,7 @@ class ExtenderItemPrivate
ExtenderItem *q; ExtenderItem *q;
QGraphicsWidget *widget; QGraphicsItem *widget;
QGraphicsWidget *toolbox; QGraphicsWidget *toolbox;
QGraphicsLinearLayout *toolboxLayout; QGraphicsLinearLayout *toolboxLayout;
QGraphicsView *toplevel; QGraphicsView *toplevel;
@ -386,7 +386,7 @@ QString ExtenderItem::name() const
return d->name; return d->name;
} }
void ExtenderItem::setWidget(QGraphicsWidget *widget) void ExtenderItem::setWidget(QGraphicsItem *widget)
{ {
qreal left, top, right, bottom; qreal left, top, right, bottom;
d->dragger->getMargins(left, top, right, bottom); d->dragger->getMargins(left, top, right, bottom);
@ -396,7 +396,7 @@ void ExtenderItem::setWidget(QGraphicsWidget *widget)
setCollapsed(isCollapsed()); //updates the size hints. setCollapsed(isCollapsed()); //updates the size hints.
} }
QGraphicsWidget *ExtenderItem::widget() const QGraphicsItem *ExtenderItem::widget() const
{ {
return d->widget; return d->widget;
} }
@ -570,12 +570,27 @@ void ExtenderItem::setCollapsed(bool collapsed)
d->widget->setVisible(!collapsed); d->widget->setVisible(!collapsed);
QSizeF minimumSize;
QSizeF preferredSize;
QSizeF maximumSize;
if (d->widget->isWidget()) {
QGraphicsWidget *graphicsWidget = static_cast<QGraphicsWidget*>(d->widget);
minimumSize = graphicsWidget->minimumSize();
preferredSize = graphicsWidget->preferredSize();
maximumSize = graphicsWidget->maximumSize();
} else {
minimumSize = d->widget->boundingRect().size();
preferredSize = d->widget->boundingRect().size();
maximumSize = d->widget->boundingRect().size();
}
if (collapsed) { if (collapsed) {
setPreferredSize(QSizeF(d->widget->preferredWidth() + left + right, setPreferredSize(QSizeF(preferredSize.width() + left + right,
d->dragHandleRect().height())); d->dragHandleRect().height()));
setMinimumSize(QSizeF(d->widget->minimumWidth() + left + right, setMinimumSize(QSizeF(minimumSize.width() + left + right,
d->dragHandleRect().height())); d->dragHandleRect().height()));
setMaximumSize(QSizeF(d->widget->maximumWidth() + left + right, setMaximumSize(QSizeF(maximumSize.width() + left + right,
d->dragHandleRect().height())); d->dragHandleRect().height()));
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
//FIXME: why don't tooltips work? //FIXME: why don't tooltips work?
@ -583,17 +598,23 @@ void ExtenderItem::setCollapsed(bool collapsed)
d->collapseIcon->setToolTip(i18n("Expand this widget")); d->collapseIcon->setToolTip(i18n("Expand this widget"));
} }
} else { } else {
setPreferredSize(QSizeF(d->widget->preferredWidth() + left + right, setPreferredSize(QSizeF(preferredSize.width() + left + right,
d->widget->preferredHeight() + preferredSize.height() +
d->dragHandleRect().height() + top + bottom)); d->dragHandleRect().height() + top + bottom));
setMinimumSize( QSizeF(d->widget->minimumWidth() + left + right, setMinimumSize( QSizeF(minimumSize.width() + left + right,
d->widget->minimumHeight() + minimumSize.height() +
d->dragHandleRect().height() + top + bottom)); d->dragHandleRect().height() + top + bottom));
setMaximumSize( QSizeF(d->widget->maximumWidth() + left + right, setMaximumSize( QSizeF(maximumSize.width() + left + right,
d->widget->maximumHeight() + maximumSize.height() +
d->dragHandleRect().height() + top + bottom)); d->dragHandleRect().height() + top + bottom));
setSizePolicy(d->widget->sizePolicy()); if (d->widget->isWidget()) {
QGraphicsWidget *graphicsWidget = static_cast<QGraphicsWidget*>(d->widget);
setSizePolicy(graphicsWidget->sizePolicy());
} else {
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
}
if (d->collapseIcon) { if (d->collapseIcon) {
d->collapseIcon->setToolTip(i18n("Collapse this widget")); d->collapseIcon->setToolTip(i18n("Collapse this widget"));
} }
@ -679,11 +700,13 @@ void ExtenderItem::resizeEvent(QGraphicsSceneResizeEvent *event)
d->appletBackground->resizePanel(event->newSize()); d->appletBackground->resizePanel(event->newSize());
//resize the widget //resize the widget
if (d->widget) { if (d->widget && d->widget->isWidget()) {
QSizeF newWidgetSize = event->newSize(); QSizeF newWidgetSize = event->newSize();
newWidgetSize.setHeight(newWidgetSize.height() - d->dragger->size().height() - top - bottom); newWidgetSize.setHeight(newWidgetSize.height() - d->dragger->size().height() - top - bottom);
newWidgetSize.setWidth(newWidgetSize.width() - left - right); newWidgetSize.setWidth(newWidgetSize.width() - left - right);
d->widget->resize(newWidgetSize);
QGraphicsWidget *graphicsWidget = static_cast<QGraphicsWidget*>(d->widget);
graphicsWidget->resize(newWidgetSize);
} }
d->updateToolBox(); d->updateToolBox();
@ -691,7 +714,6 @@ void ExtenderItem::resizeEvent(QGraphicsSceneResizeEvent *event)
void ExtenderItem::mousePressEvent(QGraphicsSceneMouseEvent *event) void ExtenderItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
{ {
kDebug() << "the mouse pressed yeah yeah yeah!";
if (!(d->dragHandleRect().contains(event->pos()))) { if (!(d->dragHandleRect().contains(event->pos()))) {
event->ignore(); event->ignore();
return; return;

6
extenderitem.h
View File

@ -46,7 +46,7 @@ class ExtenderItemPrivate;
class PLASMA_EXPORT ExtenderItem : public QGraphicsWidget class PLASMA_EXPORT ExtenderItem : public QGraphicsWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QGraphicsWidget * widget READ widget WRITE setWidget) Q_PROPERTY(QGraphicsItem * widget READ widget WRITE setWidget)
Q_PROPERTY(QString title READ title WRITE setTitle) Q_PROPERTY(QString title READ title WRITE setTitle)
Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QIcon icon READ icon WRITE setIcon) Q_PROPERTY(QIcon icon READ icon WRITE setIcon)
@ -77,12 +77,12 @@ class PLASMA_EXPORT ExtenderItem : public QGraphicsWidget
/** /**
* @param widget The widget that should be wrapped into the extender item. * @param widget The widget that should be wrapped into the extender item.
*/ */
void setWidget(QGraphicsWidget *widget); void setWidget(QGraphicsItem *widget);
/** /**
* @return The widget that is wrapped into the extender item. * @return The widget that is wrapped into the extender item.
*/ */
QGraphicsWidget *widget() const; QGraphicsItem *widget() const;
/** /**
* @param title the title that will be shown in the extender item's dragger. Default is * @param title the title that will be shown in the extender item's dragger. Default is