mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

* GridView in auto-resize mode now sets a maximum number of visible items, so we never show half-empty rows.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-16 06:41:29 +02:00
parent 5ff36d670f
commit 288f20a8f1
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libtomahawk/playlist/GridView.cpp
View File

@@ -84,8 +84,6 @@ GridView::GridView( QWidget* parent )
connect( this, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) ); connect( this, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) );
connect( proxyModel(), SIGNAL( modelReset() ), SLOT( layoutItems() ) ); connect( proxyModel(), SIGNAL( modelReset() ), SLOT( layoutItems() ) );
connect( proxyModel(), SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( verifySize() ) );
connect( proxyModel(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( verifySize() ) );
} }
@@ -98,7 +96,14 @@ GridView::~GridView()
void void
GridView::setProxyModel( PlayableProxyModel* model ) GridView::setProxyModel( PlayableProxyModel* model )
{ {
if ( m_proxyModel )
{
disconnect( m_proxyModel, SIGNAL( filterChanged( QString ) ), this, SLOT( onFilterChanged( QString ) ) );
}
m_proxyModel = model; m_proxyModel = model;
connect( m_proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onFilterChanged( QString ) ) );
m_delegate = new GridItemDelegate( this, m_proxyModel ); m_delegate = new GridItemDelegate( this, m_proxyModel );
connect( m_delegate, SIGNAL( updateIndex( QModelIndex ) ), this, SLOT( update( QModelIndex ) ) ); connect( m_delegate, SIGNAL( updateIndex( QModelIndex ) ), this, SLOT( update( QModelIndex ) ) );
setItemDelegate( m_delegate ); setItemDelegate( m_delegate );
@@ -119,6 +124,12 @@ GridView::setModel( QAbstractItemModel* model )
void void
GridView::setPlayableModel( PlayableModel* model ) GridView::setPlayableModel( PlayableModel* model )
{ {
if ( m_model )
{
disconnect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( verifySize() ) );
disconnect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( verifySize() ) );
}
m_inited = false; m_inited = false;
m_model = model; m_model = model;
@@ -128,7 +139,8 @@ GridView::setPlayableModel( PlayableModel* model )
m_proxyModel->sort( 0 ); m_proxyModel->sort( 0 );
} }
connect( m_proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onFilterChanged( QString ) ) ); connect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( verifySize() ) );
connect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( verifySize() ) );
emit modelChanged(); emit modelChanged();
} }
@@ -216,9 +228,12 @@ GridView::verifySize()
const int itemWidth = 160; const int itemWidth = 160;
const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) ); const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) );
const int rows = ceil( (double)m_proxyModel->rowCount( QModelIndex() ) / (double)itemsPerRow ); const int overlapRows = m_model->rowCount( QModelIndex() ) % itemsPerRow;
const int rows = floor( (double)m_model->rowCount( QModelIndex() ) / (double)itemsPerRow );
const int newHeight = rows * m_model->itemSize().height(); const int newHeight = rows * m_model->itemSize().height();
setFixedHeight( newHeight ); setFixedHeight( newHeight );
m_proxyModel->setMaxVisibleItems( m_model->rowCount( QModelIndex() ) - overlapRows );
} }