fix background image on video

1 files changed, 4 insertions, 1 deletions

diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 419c3ae..a4e6b6e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -163,69 +163,73 @@ VideoWidget::~VideoWidget() {
     delete imgButtonMask;
     for ( int i = 0; i < 7; i++ ) {
         delete masks[i];
     }
 }
 
 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 = new QPixmap( pix );
     pixmap->setMask( mask );
     return pixmap;
 }
 
 void VideoWidget::resizeEvent( QResizeEvent * ) {
     int h = height();
     int w = width();
     int Vh = 160;
           //videoFrame->height();
     int Vw = 220;
       //videoFrame->width();
 //    songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) );
 
     slider->setFixedWidth( w - 110 );
     slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
     slider->setBackgroundOrigin( QWidget::ParentOrigin );
+    slider->setFocusPolicy( QWidget::NoFocus );
+make    slider->setBackgroundPixmap( *pixBg );
+
 //    time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) );
     xoff = 0;// ( imgUp->width() ) / 2;
     yoff = 180;//(( Vh  - imgUp->height() ) / 2) - 10;
     QPoint p( xoff, yoff );
 
+
     QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p );
     QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p );
 
     for ( int i = 0; i < 7; i++ ) {
         if ( !masks[i]->isNull() ) {
             delete buttonPixUp[i];
             delete buttonPixDown[i];
             buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
             buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
         }
     }
 
     delete pixUp;
     delete pixDn;
 }
 
 static bool videoSliderBeingMoved = FALSE;
 
 void VideoWidget::sliderPressed() {
     videoSliderBeingMoved = TRUE;
 }
 
 void VideoWidget::sliderReleased() {
     videoSliderBeingMoved = FALSE;
     if ( slider->width() == 0 ) {
         return;
     }
     long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
     mediaPlayerState->setPosition( val );
 }
 
 void VideoWidget::setPosition( long i ) {
@@ -311,65 +315,64 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
           case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
           case VideoNext:       mediaPlayerState->setNext(); return;
           case VideoPrevious:   mediaPlayerState->setPrev(); return;
           case VideoPlayList:   mediaPlayerState->setList(); return;
           case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
         }
 
     }
 }
 
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState->fullscreen() ) {
         mediaPlayerState->setFullscreen( FALSE );
         makeVisible();
 
         mouseMoveEvent( event );
     }
 }
 
 
 void VideoWidget::makeVisible() {
   if ( mediaPlayerState->fullscreen() ) {
     setBackgroundMode( QWidget::NoBackground );
     showFullScreen();
     resize( qApp->desktop()->size() );
     slider->hide();
   videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
   } else {
-    setBackgroundPixmap( Resource::loadPixmap(  backgroundPix ) );
     showNormal();
     showMaximized();
     slider->show();
     videoFrame->setGeometry( QRect( 10, 20, 220, 160  ) );
   }
 }
 
 
 void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
 
     if ( mediaPlayerState->fullscreen() ) {
           // Clear the background
         p.setBrush( QBrush( Qt::black ) );
 //      videoFrame->setGeometry( QRect( 0, 0 , 240 ,320  ) );
 
     } else {
 
           //     videoFrame->setGeometry( QRect( 0, 15 , 240 ,170  ) );
           // draw the buttons
 
         if ( !pe->erased() ) {
               // Combine with background and double buffer
             QPixmap pix( pe->rect().size() );
             QPainter p( &pix );
             p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
             p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
             for ( int i = 0; i < numButtons; i++ )
                 paintButton( &p, i );
             QPainter p2( this );
             p2.drawPixmap( pe->rect().topLeft(), pix );
         } else {