From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 14 May 2007 22:46:01 +0000 (+0000)
Subject: The wrapping flag of QStyleOptionViewItemV2 gets lost, as the instance is assigned... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c5f8d7ca78ad5cafc5464dc8eb44509b96da6ef0

The wrapping flag of QStyleOptionViewItemV2 gets lost, as the instance is assigned to a QStyleOptionViewItem object later on (QStyleOptionViewItem AbstractItemView::viewOptions() const) -> enable the wrapping in the QListView itself.

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

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 9e5f14aa3..6d2ca66a0 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -76,10 +76,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     font.setItalic(settings->italicFont());
     font.setBold(settings->boldFont());
     m_viewOptions.font = font;
-    if (settings->numberOfTextlines() > 1) {
-        m_viewOptions.features = QStyleOptionViewItemV2::WrapText;
-    }
 
+    setWordWrap(settings->numberOfTextlines() > 1);
     updateGridSize(controller->showPreview(), controller->showAdditionalInfo());
 
     if (settings->arrangement() == QListView::TopToBottom) {
diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 212ed3e78..560d4976a 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -74,7 +74,7 @@ private:
 
 private:
     DolphinController* m_controller;
-    QStyleOptionViewItemV2 m_viewOptions;
+    QStyleOptionViewItem m_viewOptions;
 };
 
 #endif