Fix font settings issue

The font settings have been ignored currently because of the transition to the new view-engine.

The patch is based on the work of Janardhan Reddy and has been extended by the helper class ViewModeSettings.

BUG: 288395
FIXED-IN: 4.8.0

1 files changed, 5 insertions, 5 deletions

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 777cf7f74..966827017 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -90,10 +90,10 @@ KFileItemListWidget::Layout KFileItemListWidget::layout() const
 
 void KFileItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
-    KItemListWidget::paint(painter, option, widget);
-
     const_cast<KFileItemListWidget*>(this)->triggerCacheRefreshing();
 
+    KItemListWidget::paint(painter, option, widget);
+
     // Draw expansion toggle '>' or 'V'
     if (m_isDir && !m_expansionArea.isEmpty()) {
         QStyleOption arrowOption;
@@ -638,9 +638,9 @@ void KFileItemListWidget::updateIconsLayoutTextCache()
     m_text[Name].setTextWidth(maxWidth);
     m_textPos[Name] = QPointF(option.margin, widgetHeight - textLinesCount * fontHeight - option.margin);
     m_textRect = QRectF(option.margin + (maxWidth - requiredWidthForName) / 2,
-                                 m_textPos[Name].y(),
-                                 requiredWidthForName,
-                                 m_text[Name].size().height());
+                        m_textPos[Name].y(),
+                        requiredWidthForName,
+                        textLinesCountForName * fontHeight);
 
     // Calculate the position for each additional information
     qreal y = m_textPos[Name].y() + textLinesCountForName * fontHeight;