removed m_minimumSizeHint member, it is redundant

svn path=/trunk/KDE/kdebase/apps/; revision=927537

diff --git a/src/panels/information/metatextlabel.cpp b/src/panels/information/metatextlabel.cpp
index 66f12db9033367d80d4f72d4014dd154e70c576d..017d5e1dce95de3284f00fb9424aaed5cfb4e261 100644 (file)
--- a/src/panels/information/metatextlabel.cpp
+++ b/src/panels/information/metatextlabel.cpp
@@ -29,10 +29,10 @@
 
 MetaTextLabel::MetaTextLabel(QWidget* parent) :
     QWidget(parent),
 
 MetaTextLabel::MetaTextLabel(QWidget* parent) :
     QWidget(parent),

-    m_minimumHeight(0),

     m_metaInfos()
 {
     setFont(KGlobalSettings::smallestReadableFont());
     m_metaInfos()
 {
     setFont(KGlobalSettings::smallestReadableFont());

+    setMinimumHeight(0);

 }
 
 MetaTextLabel::~MetaTextLabel()
 }
 
 MetaTextLabel::~MetaTextLabel()


@@ -41,7 +41,7 @@ MetaTextLabel::~MetaTextLabel()
 
 void MetaTextLabel::clear()
 {
 
 void MetaTextLabel::clear()
 {

-    m_minimumHeight = 0;
+    setMinimumHeight(0);

     m_metaInfos.clear();
     update();
 }
     m_metaInfos.clear();
     update();
 }


@@ -51,31 +51,28 @@ void MetaTextLabel::add(const QString& labelText, const QString& infoText)
     MetaInfo metaInfo;
     metaInfo.label = labelText;
     metaInfo.info = infoText;
     MetaInfo metaInfo;
     metaInfo.label = labelText;
     metaInfo.info = infoText;

-    

     m_metaInfos.append(metaInfo);
     m_metaInfos.append(metaInfo);

-    
-    m_minimumHeight += requiredHeight(metaInfo);
-    setMinimumHeight(m_minimumHeight);
-    
+
+    setMinimumHeight(minimumHeight() + requiredHeight(metaInfo));

     update();
 }
 
 void MetaTextLabel::paintEvent(QPaintEvent* event)
 {
     QWidget::paintEvent(event);
     update();
 }
 
 void MetaTextLabel::paintEvent(QPaintEvent* event)
 {
     QWidget::paintEvent(event);

-    
+

     QPainter painter(this);
     QPainter painter(this);

-    
+

     const QColor infoColor = palette().color(QPalette::Foreground);
     QColor labelColor = infoColor;
     labelColor.setAlpha(128);
     const QColor infoColor = palette().color(QPalette::Foreground);
     QColor labelColor = infoColor;
     labelColor.setAlpha(128);

-    
+

     int y = 0;
     const int infoWidth = width() / 2;
     const int labelWidth = infoWidth - 2 * Spacing;
     const int infoX = infoWidth;
     const int maxHeight = fontMetrics().height() * 5;
     int y = 0;
     const int infoWidth = width() / 2;
     const int labelWidth = infoWidth - 2 * Spacing;
     const int infoX = infoWidth;
     const int maxHeight = fontMetrics().height() * 5;

-    
+

     QRect boundingRect;
     foreach (const MetaInfo& metaInfo, m_metaInfos) {
         // draw label (e. g. "Date:")
     QRect boundingRect;
     foreach (const MetaInfo& metaInfo, m_metaInfos) {
         // draw label (e. g. "Date:")


@@ -83,42 +80,31 @@ void MetaTextLabel::paintEvent(QPaintEvent* event)
         painter.drawText(0, y, labelWidth, maxHeight,
                          Qt::AlignTop | Qt::AlignRight | Qt::TextWordWrap,
                          metaInfo.label);
         painter.drawText(0, y, labelWidth, maxHeight,
                          Qt::AlignTop | Qt::AlignRight | Qt::TextWordWrap,
                          metaInfo.label);

-                         
+

         // draw information (e. g. "2008-11-09 20:12")
         painter.setPen(infoColor);
         painter.drawText(infoX, y, infoWidth, maxHeight,
                          Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap,
                          metaInfo.info,
                          &boundingRect);
         // draw information (e. g. "2008-11-09 20:12")
         painter.setPen(infoColor);
         painter.drawText(infoX, y, infoWidth, maxHeight,
                          Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap,
                          metaInfo.info,
                          &boundingRect);

-                         
-        y += boundingRect.height() + Spacing;
-    }
-}

 
 

-void MetaTextLabel::resizeEvent(QResizeEvent* event)
-{
-    QWidget::resizeEvent(event);
-    
-    m_minimumHeight = 0;
-    foreach (const MetaInfo& metaInfo, m_metaInfos) {
-        m_minimumHeight += requiredHeight(metaInfo);
+        y += boundingRect.height() + Spacing;

     }
     }

-    setMinimumHeight(m_minimumHeight);

 }
 
 int MetaTextLabel::requiredHeight(const MetaInfo& metaInfo) const
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 }
 
 int MetaTextLabel::requiredHeight(const MetaInfo& metaInfo) const
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);

-    
+

     qreal height = 0;
     const int leading = fontMetrics().leading();
     const int availableWidth = width() / 2;
     qreal height = 0;
     const int leading = fontMetrics().leading();
     const int availableWidth = width() / 2;

-    
+

     QTextLayout textLayout(metaInfo.info);
     textLayout.setFont(font());
     textLayout.setTextOption(textOption);
     QTextLayout textLayout(metaInfo.info);
     textLayout.setFont(font());
     textLayout.setTextOption(textOption);

-    
+

     textLayout.beginLayout();
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
     textLayout.beginLayout();
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {


@@ -126,9 +112,9 @@ int MetaTextLabel::requiredHeight(const MetaInfo& metaInfo) const
         height += leading;
         height += line.height();
         line = textLayout.createLine();
         height += leading;
         height += line.height();
         line = textLayout.createLine();

-    }    
+    }

     textLayout.endLayout();
     textLayout.endLayout();

-    
+

     return static_cast<int>(height) + Spacing;
 }
 
     return static_cast<int>(height) + Spacing;
 }
 

diff --git a/src/panels/information/metatextlabel.h b/src/panels/information/metatextlabel.h
index f70d29d8e2f64d313afb959d8994a425edff984d..36ae88e9976f79c628e6f11bd08daf381cffecc0 100644 (file)
--- a/src/panels/information/metatextlabel.h
+++ b/src/panels/information/metatextlabel.h
@@ -37,23 +37,21 @@ public:
 
     void clear();
     void add(const QString& labelText, const QString& infoText);
 
     void clear();
     void add(const QString& labelText, const QString& infoText);

-    
+

 protected:
     virtual void paintEvent(QPaintEvent* event);
 protected:
     virtual void paintEvent(QPaintEvent* event);

-    virtual void resizeEvent(QResizeEvent* event);

 
 private:
     enum { Spacing = 2 };
 
 private:
     enum { Spacing = 2 };

-    
+

     struct MetaInfo
     {
         QString label;
         QString info;
     };
     struct MetaInfo
     {
         QString label;
         QString info;
     };

-    
-    int m_minimumHeight;
+

     QList<MetaInfo> m_metaInfos;
     QList<MetaInfo> m_metaInfos;

-    
+

     /**
      * Returns the required height in pixels for \a metaInfo to
      * fit into the available width of the widget.
     /**
      * Returns the required height in pixels for \a metaInfo to
      * fit into the available width of the widget.