author | simon <simon> | 2002-12-11 12:47:06 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 12:47:06 (UTC) |
commit | dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7 (patch) (side-by-side diff) | |
tree | 565797ef0522be6d3cff893d8bc04c4378306c16 /noncore/multimedia/opieplayer2/mediawidget.cpp | |
parent | 6f5e269efd9d6a5910251ce26750134e841f7b14 (diff) | |
download | opie-dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7.zip opie-dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7.tar.gz opie-dd6a6d5345e191ffa6da3e015c4e024bd8ca67b7.tar.bz2 |
- button mask composing moved to Skin class
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 24 |
1 files changed, 2 insertions, 22 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 @@ -43,14 +43,13 @@ 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 ); for ( uint i = 0; i < buttonCount; ++i ) { Button button = setupButton( skinInfo[ i ], skin ); @@ -60,36 +59,17 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ) { 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" ); cfg.setGroup( "Options" ); QString skin = cfg.readEntry( "Skin","default" ); |