From b23b9664be34f0d5bcd7728259c64be79bf28b6d Mon Sep 17 00:00:00 2001 From: ruberg Date: Thu, 24 Feb 2011 18:26:40 +0100 Subject: [PATCH] BUG: 236853 BUG: 233235 Properly restore the size of PopupApplets from last session even when a preferredSize is set in the graphicsWidget() --- popupapplet.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/popupapplet.cpp b/popupapplet.cpp index f5febc464..507ba28b9 100644 --- a/popupapplet.cpp +++ b/popupapplet.cpp @@ -400,7 +400,7 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints) } dialog->setGraphicsWidget(gWidget); - gWidget->resize(gWidget->preferredSize()); + //gWidget->resize(gWidget->preferredSize()); dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint)); } else if (qWidget) { QVBoxLayout *l_layout = new QVBoxLayout(dialog); @@ -841,9 +841,10 @@ void PopupAppletPrivate::restoreDialogSize() int preferredWidth = 0; int preferredHeight = 0; - if (dialog->graphicsWidget()) { - preferredWidth = dialog->graphicsWidget()->preferredSize().width(); - preferredHeight = dialog->graphicsWidget()->preferredSize().height(); + QGraphicsWidget *gWidget = dialog->graphicsWidget(); + if (gWidget) { + preferredWidth = gWidget->preferredSize().width(); + preferredHeight = gWidget->preferredSize().height(); } const int width = qMin(sizeGroup.readEntry("DialogWidth", preferredWidth), @@ -861,6 +862,9 @@ void PopupAppletPrivate::restoreDialogSize() if (saved.width() != dialog->width() || saved.height() != dialog->height()) { dialog->resize(saved); + /*if (gWidget) { + gWidget->resize(saved); + }*/ } }