Fix wrong fontMetrics when using custom fonts

svn path=/trunk/KDE/kdebase/apps/; revision=1067898

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index b58fd8e1b86c3849f2a03015dd0b7272f41ad70b..26ebdc91d49f55ac1c3d5d253f762c1a00d1c3ad 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -196,6 +196,7 @@ QStyleOptionViewItem DolphinColumnView::viewOptions() const
 {
     QStyleOptionViewItem viewOptions = QListView::viewOptions();
     viewOptions.font = m_font;
+    viewOptions.fontMetrics = QFontMetrics(m_font);
     viewOptions.decorationSize = m_decorationSize;
     viewOptions.showDecorationSelected = true;
     return viewOptions;

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index d2fbb96acb7b00132c494241f7c125eb556e6b96..476ed9a3b2d9a76d16e26e6dc05fb7374a15b4e8 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -200,6 +200,7 @@ QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 {
     QStyleOptionViewItem viewOptions = QTreeView::viewOptions();
     viewOptions.font = m_font;
+    viewOptions.fontMetrics = QFontMetrics(m_font);
     viewOptions.showDecorationSelected = true;
     viewOptions.decorationSize = m_decorationSize;
     return viewOptions;

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 871fd5fbd2da1df4547917158d17f1a2b8fbe570..a4e581fb4b9979b20aa944910a4466061e03eda4 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -146,6 +146,7 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const
 {
     QStyleOptionViewItem viewOptions = KCategorizedView::viewOptions();
     viewOptions.font = m_font;
+    viewOptions.fontMetrics = QFontMetrics(m_font);
     viewOptions.decorationPosition = m_decorationPosition;
     viewOptions.decorationSize = m_decorationSize;
     viewOptions.displayAlignment = m_displayAlignment;