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

if the popup is the extender, show the configuration overlay on the main applet

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=977938
This commit is contained in:
Aaron J. Seigo 2009-06-05 16:23:48 +00:00
parent 266376639d
commit 968f969f89
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applet.cpp
View File

@ -510,7 +510,8 @@ void AppletPrivate::createMessageOverlay(bool usePopup)
messageOverlayProxy = new QGraphicsProxyWidget(q); messageOverlayProxy = new QGraphicsProxyWidget(q);
messageOverlayProxy->setWidget(popup->widget()); messageOverlayProxy->setWidget(popup->widget());
messageOverlay = new AppletOverlayWidget(messageOverlayProxy); messageOverlay = new AppletOverlayWidget(messageOverlayProxy);
} else if (usePopup && popup && popup->graphicsWidget()) { } else if (usePopup && popup && popup->graphicsWidget() &&
popup->graphicsWidget() != extender) {
messageOverlay = new AppletOverlayWidget(popup->graphicsWidget()); messageOverlay = new AppletOverlayWidget(popup->graphicsWidget());
} else { } else {
messageOverlay = new AppletOverlayWidget(q); messageOverlay = new AppletOverlayWidget(q);
@ -520,7 +521,8 @@ void AppletPrivate::createMessageOverlay(bool usePopup)
if (usePopup && popup && popup->widget()) { if (usePopup && popup && popup->widget()) {
// popupapplet with widget() // popupapplet with widget()
messageOverlay->setGeometry(popup->widget()->contentsRect()); messageOverlay->setGeometry(popup->widget()->contentsRect());
} else if (usePopup && popup && popup->graphicsWidget()) { } else if (usePopup && popup && popup->graphicsWidget() &&
popup->graphicsWidget() != extender) {
// popupapplet with graphicsWidget() // popupapplet with graphicsWidget()
messageOverlay->setGeometry(popup->graphicsWidget()->boundingRect()); messageOverlay->setGeometry(popup->graphicsWidget()->boundingRect());
} else { } else {
@ -893,7 +895,7 @@ void Applet::setConfigurationRequired(bool needsConfig, const QString &reason)
return; return;
} }
d->createMessageOverlay(); d->createMessageOverlay(false);
d->messageOverlay->opacity = 0.4; d->messageOverlay->opacity = 0.4;
QGraphicsGridLayout *configLayout = new QGraphicsGridLayout(d->messageOverlay); QGraphicsGridLayout *configLayout = new QGraphicsGridLayout(d->messageOverlay);