unbreak size save/restore in popupapplets
svn path=/trunk/KDE/kdelibs/; revision=887782
This commit is contained in:
parent
54141a7ec7
commit
fd0e2e8fc2
@ -208,8 +208,12 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
|
|||||||
|
|
||||||
qreal left, top, right, bottom;
|
qreal left, top, right, bottom;
|
||||||
q->getContentsMargins(&left, &top, &right, &bottom);
|
q->getContentsMargins(&left, &top, &right, &bottom);
|
||||||
|
QSizeF oldSize(q->size());
|
||||||
q->setMinimumSize(minimum + QSizeF(left+right, top+bottom));
|
q->setMinimumSize(minimum + QSizeF(left+right, top+bottom));
|
||||||
|
//size not saved/invalid size saved
|
||||||
|
if (oldSize.width() < q->minimumSize().width() || oldSize.height() < q->minimumSize().height()) {
|
||||||
q->resize(prefSize);
|
q->resize(prefSize);
|
||||||
|
}
|
||||||
} 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
|
||||||
savedAspectRatio = q->aspectRatioMode();
|
savedAspectRatio = q->aspectRatioMode();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user