author | simon <simon> | 2002-12-11 13:46:15 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 13:46:15 (UTC) |
commit | 2b3c450378c1da0a2175c91d652ce2eae5614ff8 (patch) (side-by-side diff) | |
tree | 4c11c70dbf487725f6e443f5db4c5a0a0c964e61 /noncore/multimedia/opieplayer2/videowidget.cpp | |
parent | cd5e96b40ceae9158e5cb01e71769e895ea7a3c1 (diff) | |
download | opie-2b3c450378c1da0a2175c91d652ce2eae5614ff8.zip opie-2b3c450378c1da0a2175c91d652ce2eae5614ff8.tar.gz opie-2b3c450378c1da0a2175c91d652ce2eae5614ff8.tar.bz2 |
- less code duplication. code from resizeEvent is now shared as well as
the image composing method and the pixmap mask helper
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index bc47717..a8ff540 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -101,17 +101,3 @@ VideoWidget::~VideoWidget() -QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { - QPixmap pix( img.width(), img.height() ); - QPainter p( &pix ); - p.drawTiledPixmap( pix.rect(), bg, offset ); - p.drawImage( 0, 0, img ); - return new QPixmap( pix ); -} - -QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) { - QPixmap pixmap( pix ); - pixmap.setMask( mask ); - return pixmap; -} - -void VideoWidget::resizeEvent( QResizeEvent * ) { +void VideoWidget::resizeEvent( QResizeEvent *e ) { int h = height(); @@ -132,18 +118,4 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; - QPoint p = upperLeftOfButtonMask; - - QPixmap *pixUp = combineVImageWithBackground( buttonUpImage, backgroundPixmap, p ); - QPixmap *pixDn = combineVImageWithBackground( buttonDownImage, backgroundPixmap, p ); - - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { - Button &button = *it; - - if ( !button.mask.isNull() ) { - button.pixUp = maskVPixToMask( *pixUp, button.mask ); - button.pixDown = maskVPixToMask( *pixDn, button.mask ); - } - } - delete pixUp; - delete pixDn; + MediaWidget::resizeEvent( e ); } |