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

don't get caught with our layout pants down: re-check the layout after calling graphicsWidget()

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=871184
This commit is contained in:
Aaron J. Seigo 2008-10-14 05:02:29 +00:00
parent 2118460d27
commit 020c81e647
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
popupapplet.cpp
View File

@ -132,6 +132,8 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
if (gWidget) {
minimum = gWidget->minimumSize();
// our layout may have been replaced on us in the call to graphicsWidget!
lay = dynamic_cast<QGraphicsLinearLayout *>(q->layout());
} else if (qWidget) {
minimum = qWidget->minimumSizeHint();
}
@ -169,7 +171,7 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
if (gWidget) {
q->setMinimumSize(gWidget->minimumSize() + marginSize);
kDebug() << lay << q->layout();
//kDebug() << lay << q->layout();
if (!lay && !q->layout()) {
lay = new QGraphicsLinearLayout();
lay->setContentsMargins(0, 0, 0, 0);
@ -179,7 +181,6 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
}
lay->addItem(gWidget);
//gWidget->installEventFilter(q);
} else if (qWidget) {
if (!proxy) {