From 968f969f89d9352b2d9fafe21b867836b381f9ad Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Fri, 5 Jun 2009 16:23:48 +0000
Subject: [PATCH] if the popup is the extender, show the configuration overlay
 on the main applet

svn path=/trunk/KDE/kdelibs/; revision=977938
---
 applet.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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