diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 02:47:43 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-05-07 22:10:11 +0200 |
| commit | 543c6eef6dca0efb5270776291202ea18f397348 (patch) | |
| tree | 38bfa9657c5df48b3d79bf82a0ddc81f490a0db5 | |
| parent | d2f156e185ca63fc8079b210a68eedcbf7a76bb6 (diff) | |
| download | amarok-543c6eef6dca0efb5270776291202ea18f397348.tar.gz amarok-543c6eef6dca0efb5270776291202ea18f397348.zip | |
Fix ARGB mode playlist throbber
Clean up console warnings
(cherry picked from commit 0c399be5ffd18519c8eedd8c7662594d19c25862)
| -rw-r--r-- | amarok/src/Options8.ui | 4 | ||||
| -rw-r--r-- | amarok/src/engine/xine/xine-config.cpp | 4 | ||||
| -rw-r--r-- | amarok/src/playlistitem.cpp | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index 82e4fb70..afca4c76 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -72,8 +72,8 @@ </property> <property name="minimumSize"> <size> - <width>-1</width> - <height>-1</height> + <width>0</width> + <height>0</height> </size> </property> <property name="text"> diff --git a/amarok/src/engine/xine/xine-config.cpp b/amarok/src/engine/xine/xine-config.cpp index cef57168..460475a0 100644 --- a/amarok/src/engine/xine/xine-config.cpp +++ b/amarok/src/engine/xine/xine-config.cpp @@ -155,9 +155,9 @@ XineEnumEntry::XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *x for( int i = 0; ent.enum_values[i]; ++i ) { input->insertItem( TQString(TQString::fromLocal8Bit( ent.enum_values[i] )) ); - input->setCurrentItem( ent.num_value ); - m_val = ent.num_value; } + input->setCurrentItem( ent.num_value ); + m_val = ent.num_value; } connect( input, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( entryChanged( int ) ) ); } diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index a4194502..02b228a0 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -42,8 +42,10 @@ #include <kfilemetainfo.h> #include <kglobal.h> #include <kiconeffect.h> +#include <kimageeffect.h> #include <kstandarddirs.h> #include <kstringhandler.h> +#include <kapplication.h> #include "playlistitem.h" @@ -986,6 +988,10 @@ void PlaylistItem::imageTransparency( TQImage& image, float factor ) //static c = data[i]; // Memory access is slow, so do it only once data[i] = tqRgba( tqRed( c ), tqGreen( c ), tqBlue( c ), table[tqAlpha( c )] ); } + + if (kapp->isX11CompositionAvailable()) { + image = KImageEffect::convertToPremultipliedAlpha(image); + } } AtomicString PlaylistItem::artist_album() const |