mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 16:44:05 +02:00
Code Issues Releases Wiki Activity

Use DpiScaler in GridView and delegate.

Browse Source
This commit is contained in:
Teo Mrnjavac
2013-07-31 12:08:41 +02:00
parent 0ccd790073
commit 872a937c03
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/libtomahawk/playlist/GridItemDelegate.cpp
View File

@@ -2,6 +2,7 @@
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2011-2012, Leo Franchi <lfranchi@kde.org> * Copyright 2011-2012, Leo Franchi <lfranchi@kde.org>
* Copyright 2013, Teo Mrnjavac <teo@kde.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -49,6 +50,7 @@ namespace {
GridItemDelegate::GridItemDelegate( QAbstractItemView* parent, PlayableProxyModel* proxy ) GridItemDelegate::GridItemDelegate( QAbstractItemView* parent, PlayableProxyModel* proxy )
: QStyledItemDelegate( (QObject*)parent ) : QStyledItemDelegate( (QObject*)parent )
, TomahawkUtils::DpiScaler( parent )
, m_view( parent ) , m_view( parent )
, m_model( proxy ) , m_model( proxy )
{ {
@@ -304,10 +306,11 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
m_playButton.clear(); m_playButton.clear();
ImageButton* button = new ImageButton( m_view ); ImageButton* button = new ImageButton( m_view );
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButton, TomahawkUtils::Original, QSize( 48, 48 ) ) ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButton, TomahawkUtils::Original, scaled( 48, 48 ) ) );
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButtonPressed, TomahawkUtils::Original, QSize( 48, 48 ) ), QIcon::Off, QIcon::Active ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButtonPressed, TomahawkUtils::Original, scaled( 48, 48 ) ), QIcon::Off, QIcon::Active );
button->setFixedSize( 48, 48 ); button->setFixedSize( scaled( 48, 48 ) );
button->move( option.rect.center() - QPoint( 23, 23 ) ); button->move( option.rect.center() - QPoint( button->width() / 2,
button->height() / 2 ) );
button->setContentsMargins( 0, 0, 0, 0 ); button->setContentsMargins( 0, 0, 0, 0 );
button->setFocusPolicy( Qt::NoFocus ); button->setFocusPolicy( Qt::NoFocus );
button->installEventFilter( this ); button->installEventFilter( this );
@@ -425,17 +428,20 @@ GridItemDelegate::onViewChanged()
foreach ( const QPersistentModelIndex& index, m_spinner.keys() ) foreach ( const QPersistentModelIndex& index, m_spinner.keys() )
{ {
QRect rect = m_view->visualRect( index ); QRect rect = m_view->visualRect( index );
m_spinner.value( index )->move( rect.center() - QPoint( 23, 23 ) ); m_spinner.value( index )->move( rect.center() - QPoint( m_spinner.value( index )->width() / 2,
m_spinner.value( index )->height() / 2 ) );
} }
foreach ( const QPersistentModelIndex& index, m_playButton.keys() ) foreach ( const QPersistentModelIndex& index, m_playButton.keys() )
{ {
QRect rect = m_view->visualRect( index ); QRect rect = m_view->visualRect( index );
m_playButton.value( index )->move( rect.center() - QPoint( 23, 23 ) ); m_playButton.value( index )->move( rect.center() - QPoint( m_playButton.value( index )->width() / 2,
m_playButton.value( index )->height() / 2 ) );
} }
foreach ( const QPersistentModelIndex& index, m_pauseButton.keys() ) foreach ( const QPersistentModelIndex& index, m_pauseButton.keys() )
{ {
QRect rect = m_view->visualRect( index ); QRect rect = m_view->visualRect( index );
m_pauseButton.value( index )->move( rect.center() - QPoint( 23, 23 ) ); m_pauseButton.value( index )->move( rect.center() - QPoint( m_pauseButton.value( index )->width() / 2,
m_pauseButton.value( index )->height() / 2 ) );
} }
} }
@@ -466,13 +472,13 @@ GridItemDelegate::updatePlayPauseButton( ImageButton* button, bool setState )
{ {
if ( button->property( "paused" ).toBool() ) if ( button->property( "paused" ).toBool() )
{ {
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButton, TomahawkUtils::Original, QSize( 48, 48 ) ) ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButton, TomahawkUtils::Original, scaled( 48, 48 ) ) );
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButtonPressed, TomahawkUtils::Original, QSize( 48, 48 ) ), QIcon::Off, QIcon::Active ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButtonPressed, TomahawkUtils::Original, scaled( 48, 48 ) ), QIcon::Off, QIcon::Active );
} }
else else
{ {
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButton, TomahawkUtils::Original, QSize( 48, 48 ) ) ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButton, TomahawkUtils::Original, scaled( 48, 48 ) ) );
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButtonPressed, TomahawkUtils::Original, QSize( 48, 48 ) ), QIcon::Off, QIcon::Active ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PlayButtonPressed, TomahawkUtils::Original, scaled( 48, 48 ) ), QIcon::Off, QIcon::Active );
} }
if ( setState ) if ( setState )
@@ -551,10 +557,11 @@ void
GridItemDelegate::createPauseButton( const QPersistentModelIndex& index ) GridItemDelegate::createPauseButton( const QPersistentModelIndex& index )
{ {
ImageButton* button = new ImageButton( m_view ); ImageButton* button = new ImageButton( m_view );
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButton, TomahawkUtils::Original, QSize( 48, 48 ) ) ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButton, TomahawkUtils::Original, scaled( 48, 48 ) ) );
button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButtonPressed, TomahawkUtils::Original, QSize( 48, 48 ) ), QIcon::Off, QIcon::Active ); button->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::PauseButtonPressed, TomahawkUtils::Original, scaled( 48, 48 ) ), QIcon::Off, QIcon::Active );
button->setFixedSize( 48, 48 ); button->setFixedSize( scaled( 48, 48 ) );
button->move( m_view->visualRect( index ).center() - QPoint( 23, 23 ) ); button->move( m_view->visualRect( index ).center() - QPoint( button->width() / 2,
button->height() / 2 ) );
button->setContentsMargins( 0, 0, 0, 0 ); button->setContentsMargins( 0, 0, 0, 0 );
button->setFocusPolicy( Qt::NoFocus ); button->setFocusPolicy( Qt::NoFocus );
button->installEventFilter( this ); button->installEventFilter( this );

3
src/libtomahawk/playlist/GridItemDelegate.h
View File

@@ -24,6 +24,7 @@
#include <QTimeLine> #include <QTimeLine>
#include "DllMacro.h" #include "DllMacro.h"
#include "utils/DpiScaler.h"
namespace Tomahawk { namespace Tomahawk {
class PixmapDelegateFader; class PixmapDelegateFader;
@@ -38,7 +39,7 @@ class QTimeLine;
class PlayableProxyModel; class PlayableProxyModel;
class ImageButton; class ImageButton;
class DLLEXPORT GridItemDelegate : public QStyledItemDelegate class DLLEXPORT GridItemDelegate : public QStyledItemDelegate, private TomahawkUtils::DpiScaler
{ {
Q_OBJECT Q_OBJECT

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

@@ -51,6 +51,7 @@ using namespace Tomahawk;
GridView::GridView( QWidget* parent ) GridView::GridView( QWidget* parent )
: QListView( parent ) : QListView( parent )
, TomahawkUtils::DpiScaler( this )
, m_model( 0 ) , m_model( 0 )
, m_proxyModel( 0 ) , m_proxyModel( 0 )
, m_delegate( 0 ) , m_delegate( 0 )
@@ -247,7 +248,7 @@ GridView::verifySize()
scrollbar = 0; //don't count it any more scrollbar = 0; //don't count it any more
const int rectWidth = contentsRect().width() - scrollbar - 3; const int rectWidth = contentsRect().width() - scrollbar - 3;
const int itemWidth = 160; const int itemWidth = scaledX( 160 );
const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) ); const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) );
const int overlapRows = m_model->rowCount( QModelIndex() ) % itemsPerRow; const int overlapRows = m_model->rowCount( QModelIndex() ) % itemsPerRow;
@@ -287,7 +288,7 @@ GridView::layoutItems()
scrollbar = 0; //don't count it any more scrollbar = 0; //don't count it any more
const int rectWidth = contentsRect().width() - scrollbar - 3; const int rectWidth = contentsRect().width() - scrollbar - 3;
const int itemWidth = 160; const int itemWidth = scaledX( 160 );
const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) ); const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) );
const int remSpace = rectWidth - ( itemsPerRow * itemWidth ); const int remSpace = rectWidth - ( itemsPerRow * itemWidth );

6
src/libtomahawk/playlist/GridView.h
View File

@@ -28,6 +28,8 @@
#include "PlayableProxyModel.h" #include "PlayableProxyModel.h"
#include "widgets/OverlayWidget.h" #include "widgets/OverlayWidget.h"
#include "DllMacro.h" #include "DllMacro.h"
#include "utils/DpiScaler.h"
namespace Tomahawk namespace Tomahawk
{ {
@@ -39,7 +41,9 @@ class GridItemDelegate;
class PlayableModel; class PlayableModel;
class GridPlaylistInterface; class GridPlaylistInterface;
class DLLEXPORT GridView : public QListView, public Tomahawk::ViewPage class DLLEXPORT GridView : public QListView,
public Tomahawk::ViewPage,
private TomahawkUtils::DpiScaler
{ {
Q_OBJECT Q_OBJECT