summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp24
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp36
-rw-r--r--noncore/multimedia/opieplayer2/skin.h7
4 files changed, 41 insertions, 27 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 4de7ea9..da0706e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -46,8 +46,7 @@ MediaWidget::~MediaWidget()
void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
const Skin &skin, const QSize &buttonAreaSize )
{
- buttonMask = QImage( buttonAreaSize, 8, 255 );
- buttonMask.fill( 0 );
+ buttonMask = skin.buttonMask( skinInfo, buttonCount, buttonAreaSize );
buttons.clear();
buttons.reserve( buttonCount );
@@ -63,30 +62,11 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo,
Button button;
button.command = buttonInfo.command;
button.type = buttonInfo.type;
-
- button.mask = setupButtonMask( button.command, skin.buttonMaskImage( buttonInfo.fileName ) );
+ button.mask = skin.buttonMaskImage( buttonInfo.fileName );
return button;
}
-QBitmap MediaWidget::setupButtonMask( const Command &command, const QImage &maskImage )
-{
- if ( maskImage.isNull() )
- return QBitmap();
-
- uchar **dest = buttonMask.jumpTable();
- for ( int y = 0; y < buttonMask.height(); y++ ) {
- uchar *line = dest[y];
- for ( int x = 0; x < buttonMask.width(); x++ )
- if ( !qRed( maskImage.pixel( x, y ) ) )
- line[x] = command + 1;
- }
-
- // ### grmbl qt2. use constructor when switching to qt3.
- QBitmap bm; bm = maskImage;
- return bm;
-}
-
void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
{
Config cfg( "OpiePlayer" );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 0d635aa..4bd8760 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -104,7 +104,6 @@ protected:
void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
const Skin &skin, const QSize &buttonAreaSize );
Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin );
- QBitmap setupButtonMask( const Command &command, const QImage &maskImage );
void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null );
void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix );
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 7d05d80..ef70957 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -9,13 +9,12 @@ Skin::Skin( const QString &name, const QString &fileNameInfix )
m_skinPath = "opieplayer2/skins/" + name;
}
-void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount )
+void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize )
{
backgroundImage();
buttonUpImage();
buttonDownImage();
- for ( uint i = 0; i < buttonCount; ++i )
- ( void )buttonMaskImage( skinButtonInfo[ i ].fileName );
+ ( void )buttonMask( skinButtonInfo, buttonCount, buttonAreaSize );
}
QImage Skin::backgroundImage() const
@@ -39,6 +38,37 @@ QImage Skin::buttonDownImage() const
return m_buttonDownImage;
}
+QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const
+{
+ if ( buttonAreaSize != m_buttonMask.size() )
+ m_buttonMask = QImage();
+
+ if ( !m_buttonMask.isNull() )
+ return m_buttonMask;
+
+ m_buttonMask = QImage( buttonAreaSize, 8, 255 );
+ m_buttonMask.fill( 0 );
+
+ for ( uint i = 0; i < buttonCount; ++i )
+ addButtonToMask( skinButtonInfo[ i ].command + 1, buttonMaskImage( skinButtonInfo[ i ].fileName ) );
+
+ return m_buttonMask;
+}
+
+void Skin::addButtonToMask( int tag, const QImage &maskImage ) const
+{
+ if ( maskImage.isNull() )
+ return;
+
+ uchar **dest = m_buttonMask.jumpTable();
+ for ( int y = 0; y < m_buttonMask.height(); y++ ) {
+ uchar *line = dest[y];
+ for ( int x = 0; x < m_buttonMask.width(); x++ )
+ if ( !qRed( maskImage.pixel( x, y ) ) )
+ line[x] = tag;
+ }
+}
+
QImage Skin::buttonMaskImage( const QString &fileName ) const
{
ButtonMaskImageMap::Iterator it = m_buttonMasks.find( fileName );
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 9276a5b..14873e7 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -12,15 +12,19 @@ class Skin
public:
Skin( const QString &name, const QString &fileNameInfix );
- void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount );
+ void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize );
QImage backgroundImage() const;
QImage buttonUpImage() const;
QImage buttonDownImage() const;
+ QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const;
+
QImage buttonMaskImage( const QString &fileName ) const;
private:
+ void addButtonToMask( int tag, const QImage &maskImage ) const;
+
QString m_name;
QString m_fileNameInfix;
QString m_skinPath;
@@ -30,6 +34,7 @@ private:
mutable QImage m_backgroundImage;
mutable QImage m_buttonUpImage;
mutable QImage m_buttonDownImage;
+ mutable QImage m_buttonMask;
mutable ButtonMaskImageMap m_buttonMasks;
Skin( const Skin & );