Forwardport 773570:

[dolphin.git] / src / statusbarmessagelabel.cpp

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 7099374fcc62fe502bce2004b022f507d9837d0c..e24a59add4949a0cfc57e9cc34f12f6e5709507f 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -89,7 +89,8 @@ void StatusBarMessageLabel::setMessage(const QString& text,
     QPixmap pixmap;
     switch (type) {
     case DolphinStatusBar::OperationCompleted:
-        iconName = "ok";
+        iconName = "dialog-ok";
+        // "ok" icon should probably be "dialog-success", but we don't have that icon in KDE 4.0
         m_closeButton->hide();
         break;
 
@@ -142,10 +143,10 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     // draw background
     QColor backgroundColor = palette().window().color();
     if (m_illumination > 0) {
+        // at this point, a: we are a second label being drawn over the already
+        // painted status area, so we can be translucent, and b: our palette's
+        // window color (bg only) seems to be wrong (always black)
         KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
-//         QColor blendColor = scheme.background(KColorScheme::NegativeBackground).color();
-//         backgroundColor = scheme.background().color(); // FIXME shouldn't be needed but I'm getting black otherwise??
-//         backgroundColor = KColorUtils::mix(backgroundColor, blendColor, double(m_illumination) / 128.0);
         backgroundColor = scheme.background(KColorScheme::NegativeBackground).color();
         backgroundColor.setAlpha(qMin(255, m_illumination*2));
     }
@@ -228,15 +229,20 @@ void StatusBarMessageLabel::assureVisibleText()
         return;
     }
 
-    // calculate the required height of the widget thats
-    // needed for having a fully visible text
-    QFontMetrics fontMetrics(font());
-    const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(),
-                       Qt::AlignVCenter | Qt::TextWordWrap,
-                       m_text));
-    int requiredHeight = bounds.height();
-    if (requiredHeight < m_minTextHeight) {
-        requiredHeight = m_minTextHeight;
+    int requiredHeight = m_minTextHeight;
+    if (m_type != DolphinStatusBar::Default) {
+        // Calculate the required height of the widget thats
+        // needed for having a fully visible text. Note that for the default
+        // statusbar type (e. g. hover information) increasing the text height
+        // is not wanted, as this might rearrange the layout of items.
+
+        QFontMetrics fontMetrics(font());
+        const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(),
+                           Qt::AlignVCenter | Qt::TextWordWrap, m_text));
+        requiredHeight = bounds.height();
+        if (requiredHeight < m_minTextHeight) {
+            requiredHeight = m_minTextHeight;
+        }
     }
 
     // Increase/decrease the current height of the widget to the