Further optimizations: do a delayed update of the geometry. This leads to a reduced...

svn path=/trunk/playground/utils/dolphin/; revision=627494

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index de66bebba3e1c8932e266ed59dbbd478a30fc991..1178a16886588af6ddc4e4ae08c87a3cde4b9074 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -79,7 +79,7 @@ void StatusBarMessageLabel::setType(DolphinStatusBar::Type type)
         }
 
         m_pixmap = (iconName == 0) ? QPixmap() : SmallIcon(iconName);
         }
 
         m_pixmap = (iconName == 0) ? QPixmap() : SmallIcon(iconName);

-        assureVisibleText();
+        QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));

         update();
     }
 }
         update();
     }
 }


@@ -93,7 +93,7 @@ void StatusBarMessageLabel::setText(const QString& text)
             m_state = Illuminate;
         }
         m_text = text;
             m_state = Illuminate;
         }
         m_text = text;

-        assureVisibleText();
+        QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));

         update();
     }
 }
         update();
     }
 }


@@ -139,14 +139,18 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
 
     // draw text
     painter.setPen(foregroundColor);
 
     // draw text
     painter.setPen(foregroundColor);

-    painter.drawText(QRect(x, 0, width() - x, height()), Qt::AlignVCenter | Qt::TextWordWrap, m_text);
+    int flags = Qt::AlignVCenter;
+    if (height() > m_minTextHeight) {
+        flags = flags | Qt::TextWordWrap;
+    }
+    painter.drawText(QRect(x, 0, width() - x, height()), flags, m_text);

     painter.end();
 }
 
 void StatusBarMessageLabel::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
     painter.end();
 }
 
 void StatusBarMessageLabel::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);

-    QTimer::singleShot(0, this, SLOT(assureVisibleText()));
+    QTimer::singleShot(GeometryTimeout, this, SLOT(assureVisibleText()));

 }
 
 void StatusBarMessageLabel::timerDone()
 }
 
 void StatusBarMessageLabel::timerDone()

diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index 922465584d8b9011d2254887a4d36a34de33d618..03683c107290cf732b0274f621599f532e4d91b6 100644 (file)
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -92,6 +92,8 @@ private:
         Desaturate
     };
 
         Desaturate
     };
 

+    enum { GeometryTimeout = 100 };
+

     DolphinStatusBar::Type m_type;
     State m_state;
     int m_illumination;
     DolphinStatusBar::Type m_type;
     State m_state;
     int m_illumination;