From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sat, 25 Sep 2010 22:01:05 +0000 (+0000)
Subject: Use KStringHandler::preProcessWrap() when calculating the width of a
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/732459f4e29707faaae63645ffe1aae31215e77e

Use KStringHandler::preProcessWrap() when calculating the width of a
file name in DolphinFileItemDelegate. This makes sure that zero width
spaces (which prevent kerning) are added at the same places where
KFileItemDelegate adds them when actually rendering the name. Fixes
the problem that file names are elided and partly replaced by "..."
even though there is enough space for the full name.

CCBUG: 251121

svn path=/trunk/KDE/kdebase/apps/; revision=1179568
---

diff --git a/src/views/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp
index 6b706c88b..609a12b98 100644
--- a/src/views/dolphinfileitemdelegate.cpp
+++ b/src/views/dolphinfileitemdelegate.cpp
@@ -23,6 +23,7 @@
 #include <kfileitem.h>
 #include <kicon.h>
 #include <kiconloader.h>
+#include <kstringhandler.h>
 
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
@@ -82,7 +83,7 @@ void DolphinFileItemDelegate::paint(QPainter* painter,
 int DolphinFileItemDelegate::nameColumnWidth(const QString& name, const QStyleOptionViewItem& option)
 {
     QFontMetrics fontMetrics(option.font);
-    int width = option.decorationSize.width() + fontMetrics.width(name) + 16;
+    int width = option.decorationSize.width() + fontMetrics.width(KStringHandler::preProcessWrap(name)) + 16;
 
     const int defaultWidth = option.rect.width();
     if ((defaultWidth > 0) && (defaultWidth < width)) {