summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-29 11:33:30 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-10-29 11:33:30 +0100
commit67abfb6c3025de41f85eccbe7a51021309c240b0 (patch)
treecfa3fde9b86f49ea61ef14904ba54afcc0f458f9 /src
parentMerge commit 'refs/merge-requests/1946' of git://gitorious.org/rekonq/mainlin... (diff)
parentfix maximal popup width (diff)
downloadrekonq-67abfb6c3025de41f85eccbe7a51021309c240b0.tar.xz
Merge commit 'refs/merge-requests/1947' of git://gitorious.org/rekonq/mainline into mr1947
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index abf82dbf..796c2bad 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -978,9 +978,9 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
// setting the popup
QLabel *label = new QLabel(msg);
- label->setMaximumWidth(width()-2*margin);
m_popup->setView(label);
QSize labelSize(label->fontMetrics().width(msg)+2*margin, label->fontMetrics().height()+2*margin);
+ if (labelSize.width() > width()) labelSize.setWidth(width());
m_popup->setFixedSize(labelSize);
m_popup->layout()->setAlignment(Qt::AlignTop);
m_popup->layout()->setMargin(margin);