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

* cache value of widget() as we do graphicsWidget()

Browse Source 
* have graphicsWidget() return the extender by default

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=862088
This commit is contained in:
Aaron J. Seigo 2008-09-18 02:44:53 +00:00
parent 0ae78795da
commit d5820171d8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
popupapplet.cpp
View File

@ -149,7 +149,7 @@ QWidget *PopupApplet::widget()
QGraphicsWidget *PopupApplet::graphicsWidget() QGraphicsWidget *PopupApplet::graphicsWidget()
{ {
return 0; return extender();
} }
void PopupApplet::constraintsEvent(Plasma::Constraints constraints) void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
@ -175,11 +175,12 @@ void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
QSizeF containmentSize; QSizeF containmentSize;
QGraphicsWidget *gWidget = graphicsWidget(); QGraphicsWidget *gWidget = graphicsWidget();
QWidget *qWidget = widget();
if (gWidget) { if (gWidget) {
minimum = gWidget->minimumSize(); minimum = gWidget->minimumSize();
} else if (widget()) { } else if (qWidget) {
minimum = widget()->minimumSizeHint(); minimum = qWidget->minimumSizeHint();
} }
if (containment()) { if (containment()) {
@ -199,9 +200,9 @@ void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
} }
if (d->dialog) { if (d->dialog) {
if (d->dialog->layout() && widget()) { if (d->dialog->layout() && qWidget) {
//we dont want to delete Widget inside the dialog layout //we dont want to delete Widget inside the dialog layout
d->dialog->layout()->removeWidget(widget()); d->dialog->layout()->removeWidget(qWidget);
} }
delete d->dialog; delete d->dialog;
@ -217,17 +218,18 @@ void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
} }
setMinimumSize(gWidget->minimumSize() + marginSize); setMinimumSize(gWidget->minimumSize() + marginSize);
gWidget->installEventFilter(this); gWidget->installEventFilter(this);
} else if (widget()) { } else if (qWidget) {
if (!d->proxy) { if (!d->proxy) {
d->proxy = new QGraphicsProxyWidget(this); d->proxy = new QGraphicsProxyWidget(this);
d->proxy->setWidget(widget()); d->proxy->setWidget(qWidget);
d->proxy->show(); d->proxy->show();
} }
if (lay) { if (lay) {
lay->addItem(d->proxy); lay->addItem(d->proxy);
} }
setMinimumSize(widget() ? widget()->minimumSize() + marginSize : QSizeF(300, 200));
setMinimumSize(qWidget ? qWidget->minimumSize() + marginSize : QSizeF(300, 200));
} }
} else { } else {
//save the aspect ratio mode in case we drag'n drop in the Desktop later //save the aspect ratio mode in case we drag'n drop in the Desktop later
@ -269,11 +271,11 @@ void PopupApplet::constraintsEvent(Plasma::Constraints constraints)
graphicsWidget()->setMinimumSize(gWidget->preferredSize()); graphicsWidget()->setMinimumSize(gWidget->preferredSize());
d->dialog->setGraphicsWidget(gWidget); d->dialog->setGraphicsWidget(gWidget);
} }
} else if (widget()) { } else if (qWidget) {
QVBoxLayout *l_layout = new QVBoxLayout(d->dialog); QVBoxLayout *l_layout = new QVBoxLayout(d->dialog);
l_layout->setSpacing(0); l_layout->setSpacing(0);
l_layout->setMargin(0); l_layout->setMargin(0);
l_layout->addWidget(widget()); l_layout->addWidget(qWidget);
} }
} }