[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_kdeui/widgets=3A_Size_fixes?=
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2011-04-30 17:25:16
Message-ID: 20110430172516.D386DA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit cf6884be80b4cecb82c3ebecc9a3f974c1963da0 by Aurélien Gâteau.
Committed on 30/04/2011 at 19:25.
Pushed by gateau into branch 'master'.

Size fixes

M  +14   -1    kdeui/widgets/kmessagewidget.cpp     
M  +4    -0    kdeui/widgets/kmessagewidget.h     

http://commits.kde.org/kdelibs/cf6884be80b4cecb82c3ebecc9a3f974c1963da0

diff --git a/kdeui/widgets/kmessagewidget.cpp b/kdeui/widgets/kmessagewidget.cpp
index 4b35ea5..43e3bb6 100644
--- a/kdeui/widgets/kmessagewidget.cpp
+++ b/kdeui/widgets/kmessagewidget.cpp
@@ -67,7 +67,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
 {
     q = q_ptr;
 
-    q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    q->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
     timeLine = new QTimeLine(500, q);
     QObject::connect(timeLine, SIGNAL(valueChanged(qreal)), q, SLOT(slotTimeLineChanged(qreal)));
@@ -209,6 +209,7 @@ QString KMessageWidget::text() const
 void KMessageWidget::setText(const QString& text)
 {
     d->textLabel->setText(text);
+    updateGeometry();
 }
 
 KMessageWidget::MessageType KMessageWidget::messageType() const
@@ -267,6 +268,18 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
         );
 }
 
+QSize KMessageWidget::sizeHint() const
+{
+    ensurePolished();
+    return d->content->sizeHint();
+}
+
+QSize KMessageWidget::minimumSizeHint() const
+{
+    ensurePolished();
+    return d->content->minimumSizeHint();
+}
+
 bool KMessageWidget::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish && !d->content->layout()) {
diff --git a/kdeui/widgets/kmessagewidget.h b/kdeui/widgets/kmessagewidget.h
index 82ddb22..55f4c12 100644
--- a/kdeui/widgets/kmessagewidget.h
+++ b/kdeui/widgets/kmessagewidget.h
@@ -128,6 +128,10 @@ public:
 
     void removeAction(QAction* action);
 
+    QSize sizeHint() const;
+
+    QSize minimumSizeHint() const;
+
 public Q_SLOTS:
     void setText(const QString &);
 

[prev in list] [next in list] [prev in thread] [next in thread]