From f1723a85c0184b95a4ef9ade62f95e307e9f6f0d Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sat, 29 Jan 2011 13:20:27 -0500
Subject: [PATCH] tighten up the layout
---
.../playlist/dynamic/echonest/EchonestGenerator.cpp | 6 +++---
.../playlist/dynamic/widgets/DynamicControlWrapper.cpp | 4 ++--
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index 03aa5fe86..d81b92aad 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -310,7 +310,7 @@ EchonestGenerator::sentenceSummary()
QString center, suffix;
QString summary = artist.dynamicCast< EchonestControl >()->summary();
- if( i == 0 ) { // if it's the first.. special case
+ if( i == 0 ) { // if it's the first.. special casez
center = summary.remove( "~" );
if( artists.size() == 2 ) // special case for 2, no comma. ( X and Y )
suffix = " and ";
@@ -332,9 +332,9 @@ EchonestGenerator::sentenceSummary()
}
sentence += center + suffix;
}
- qDebug() << "Got artists:" << sentence;
+ /// Add each filter individually
for( int i = 0; i < allcontrols.size(); i++ ) {
- // end case: if this is the last AND there is not a sorting filter (so this is the real last one)
+ /// end case: if this is the last AND there is not a sorting filter (so this is the real last one)
const bool last = ( i == allcontrols.size() - 1 && sorting.isNull() );
QString prefix, suffix;
if( last ) {
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
index e04d7c541..4e45056a0 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
@@ -123,8 +123,8 @@ QWidget* DynamicControlWrapper::createDummy( QWidget* fromW, QWidget* parent )
QWidget* dummy = new QWidget( parent );
dummy->setContentsMargins( 0, 0, 0, 0 );
dummy->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
- dummy->setMinimumSize( fromW->size() );
- dummy->setMaximumSize( fromW->size() );
+ dummy->setMinimumSize( fromW->sizeHint() );
+ dummy->setMaximumSize( fromW->sizeHint() );
return dummy;
}
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index 4ba8bff09..a1f73d1fd 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
@@ -77,7 +77,7 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
m_logo = new QLabel( this );
if( !playlist->generator()->logo().isNull() ) {
- QPixmap p = playlist->generator()->logo().scaledToHeight( m_headerText->height(), Qt::SmoothTransformation );
+ QPixmap p = playlist->generator()->logo().scaledToHeight( 16, Qt::SmoothTransformation );
m_logo->setPixmap( p );
}
m_headerLayout->addWidget(m_logo);