tweak for landscape mode

1 files changed, 16 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 8e3a365..b0ec673 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -180,31 +180,34 @@ 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;
     //int Vw = 220;
 
     slider->setFixedWidth( w - 20 );
-    slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
+    slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
     slider->setBackgroundOrigin( QWidget::ParentOrigin );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setBackgroundPixmap( *pixBg );
 
     xoff = 0;// ( imgUp->width() ) / 2;
-    yoff = 185;//(( Vh  - imgUp->height() ) / 2) - 10;
+    if(w>h)
+        yoff = 0;
+    else
+        yoff = 185;//(( 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] );
         }
@@ -386,25 +389,35 @@ void VideoWidget::makeVisible() {
         showNormal();
         showMaximized();
         setBackgroundPixmap( *pixBg );
         if ( mediaPlayerState->streaming() ) {
             slider->hide();
             disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         } else {
             slider->show();
             connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         }
-        videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
+
+        QWidget *d = QApplication::desktop();
+        int w=d->width(); 
+        int h=d->height();
+
+        if(w>h) {
+            int newW=(w/2)-(246/2); //this will only work with 320x240
+            videoFrame->setGeometry( QRect( newW, 4, 240, 170  ) );
+        } else
+            videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
+
         qApp->processEvents();
     }
 }
 
 
 void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
 
     if ( mediaPlayerState->fullscreen() ) {
         // Clear the background
         p.setBrush( QBrush( Qt::black ) );
     } else {