From 819b6d0f0a92d0df772cd9d3f63b13d92906bd62 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 4 Nov 2014 17:11:46 +0100
Subject: [PATCH] Set correct GridItemDelegate mode and correctly calculate
 height for remaining GridViews.

---
 src/libtomahawk/viewpages/CollectionViewPage.cpp | 2 ++
 src/libtomahawk/viewpages/SearchViewPage.cpp     | 9 ++++++---
 src/viewpages/charts/ChartsWidget.cpp            | 2 ++
 src/viewpages/newreleases/NewReleasesWidget.cpp  | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/libtomahawk/viewpages/CollectionViewPage.cpp b/src/libtomahawk/viewpages/CollectionViewPage.cpp
index a66351505..12f09bfbf 100644
--- a/src/libtomahawk/viewpages/CollectionViewPage.cpp
+++ b/src/libtomahawk/viewpages/CollectionViewPage.cpp
@@ -28,6 +28,7 @@
 #include "playlist/TreeModel.h"
 #include "playlist/ColumnView.h"
 #include "playlist/TrackView.h"
+#include "playlist/GridItemDelegate.h"
 #include "playlist/GridView.h"
 #include "playlist/PlayableProxyModelPlaylistInterface.h"
 #include "resolvers/ScriptCollection.h"
@@ -68,6 +69,7 @@ CollectionViewPage::CollectionViewPage( const Tomahawk::collection_ptr& collecti
         m_albumView->setAutoFitItems( true );
         m_albumView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
         m_albumView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 170 ) );
+        m_albumView->delegate()->setWordWrapping( true );
 
         m_albumView->proxyModel()->sort( -1 );
         m_albumView->setEmptyTip( tr( "Sorry, there are no albums in this collection!" ) );
diff --git a/src/libtomahawk/viewpages/SearchViewPage.cpp b/src/libtomahawk/viewpages/SearchViewPage.cpp
index 0b109a47a..928642cce 100644
--- a/src/libtomahawk/viewpages/SearchViewPage.cpp
+++ b/src/libtomahawk/viewpages/SearchViewPage.cpp
@@ -28,6 +28,7 @@
 #include "playlist/TrackView.h"
 #include "playlist/PlayableModel.h"
 #include "playlist/PlaylistModel.h"
+#include "playlist/GridItemDelegate.h"
 #include "utils/AnimatedSpinner.h"
 #include "utils/TomahawkStyle.h"
 #include "utils/TomahawkUtilsGui.h"
@@ -56,7 +57,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
         ui->artists->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
         ui->artists->setWrapping( false );
         ui->artists->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) );
-        ui->artists->setFixedHeight( 140 + 32 + 38 );
+        ui->artists->setFixedHeight( ui->artists->itemSize().height() + ui->artists->spacing() * 2 );
 
         m_artistsModel = new PlayableModel( ui->artists );
         ui->artists->setPlayableModel( m_artistsModel );
@@ -76,7 +77,8 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
         ui->albums->setWrapping( false );
         ui->albums->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) );
 //        ui->albums->proxyModel()->setHideDupeItems( true );
-        ui->albums->setFixedHeight( 140 + 56 + 38 );
+        ui->albums->delegate()->setWordWrapping( true );
+        ui->albums->setFixedHeight( ui->albums->itemSize().height() + ui->albums->spacing() * 2 );
 
         m_albumsModel = new PlayableModel( ui->albums );
         ui->albums->setPlayableModel( m_albumsModel );
@@ -97,7 +99,8 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
         ui->tracks->setWrapping( false );
         ui->tracks->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) );
 //        ui->tracks->proxyModel()->setHideDupeItems( true );
-        ui->tracks->setFixedHeight( 140 + 56 + 38 );
+        ui->tracks->delegate()->setWordWrapping( true );
+        ui->tracks->setFixedHeight( ui->tracks->itemSize().height() + ui->tracks->spacing() * 2 );
 
         m_resultsModel = new PlayableModel( ui->tracks );
         ui->tracks->setPlayableModel( m_resultsModel );
diff --git a/src/viewpages/charts/ChartsWidget.cpp b/src/viewpages/charts/ChartsWidget.cpp
index 105ed7d07..864ca8c9b 100644
--- a/src/viewpages/charts/ChartsWidget.cpp
+++ b/src/viewpages/charts/ChartsWidget.cpp
@@ -70,6 +70,8 @@ ChartsWidget::ChartsWidget( QWidget* parent )
     ui->artistsView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) );
     ui->albumsView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) );
     ui->tracksView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) );
+    ui->albumsView->delegate()->setWordWrapping( true );
+    ui->tracksView->delegate()->setWordWrapping( true );
     ui->artistsView->delegate()->setShowPosition( true );
     ui->albumsView->delegate()->setShowPosition( true );
     ui->tracksView->delegate()->setShowPosition( true );
diff --git a/src/viewpages/newreleases/NewReleasesWidget.cpp b/src/viewpages/newreleases/NewReleasesWidget.cpp
index 1cd9508ac..754daf99d 100644
--- a/src/viewpages/newreleases/NewReleasesWidget.cpp
+++ b/src/viewpages/newreleases/NewReleasesWidget.cpp
@@ -24,6 +24,7 @@
 
 #include "ViewManager.h"
 #include "audio/AudioEngine.h"
+#include "playlist/GridItemDelegate.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/AnimatedSpinner.h"
@@ -75,6 +76,8 @@ NewReleasesWidget::NewReleasesWidget( QWidget* parent )
     m_spinner = new AnimatedSpinner( ui->albumsView );
     m_spinner->fadeIn();
 
+    ui->albumsView->delegate()->setWordWrapping( true );
+
     fetchData();
 }