From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 6 Oct 2011 14:41:29 +0000 (+0200)
Subject: Use QFontMetrics::height() instead of averageCharWidth()
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/16d4f059c32899d284b202a26af5236cc899abc8?ds=inline

Use QFontMetrics::height() instead of averageCharWidth()

QFontMetrics::averageCharWidth() is quite slow and does not work
well on fonts with broken characters. In the
usecases required by Dolphin QFontMetrics::height() is a better
and faster alternative to get a font-dependent minimum width.

Thanks go to Christoph Feck for this hint!
---

diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index f9b976369..0b94f327b 100644
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -337,7 +337,7 @@ bool KItemListHeader::isAboveRoleGrip(const QPointF& pos, int roleIndex) const
 qreal KItemListHeader::minimumRoleWidth() const
 {
     QFontMetricsF fontMetrics(font());
-    return fontMetrics.averageCharWidth() * 8;
+    return fontMetrics.height() * 4;
 }
 
 #include "kitemlistheader_p.moc"
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index d65eb5b7c..06644e1f3 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -91,7 +91,7 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
-    const int maxWidth = metrics.averageCharWidth() * 15;
+    const int maxWidth = metrics.height() * 8;
 
     QString location = url.fileName();
     if (location.isEmpty()) {