1 files changed, 22 insertions, 15 deletions

diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 238770b..c2080e6 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -81,13 +81,15 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
+
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
+    connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
 
     QString skinPath = "opieplayer2/skins/" + skin;
@@ -340,14 +342,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                         return;
                     } else if( !mediaPlayerState->isPaused ) {
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
                         return;
                     } else {
-                        //  setToggleButton( i, TRUE );
-                        // mediaPlayerState->setPlaying( videoButtons[i].isDown );
+                        return;
                     }
                 }
 
                 case VideoStop:       mediaPlayerState->setPlaying( FALSE ); return;
                 case VideoNext:       mediaPlayerState->setNext(); return;
                 case VideoPrevious:   mediaPlayerState->setPrev(); return;
@@ -375,26 +376,32 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
 void VideoWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 
+ void VideoWidget::backToNormal() {
+     mediaPlayerState->setFullscreen( FALSE );
+     makeVisible();
+ }
+
 void VideoWidget::makeVisible() {
-  if ( mediaPlayerState->fullscreen() ) {
-    setBackgroundMode( QWidget::NoBackground );
-    showFullScreen();
-    resize( qApp->desktop()->size() );
-    slider->hide();
-    videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
-  } else {
-      showNormal();
-    showMaximized();
-    slider->show();
-    videoFrame->setGeometry( QRect( 10, 20, 220, 160  ) );
-    qApp->processEvents();
-  }
+    if ( mediaPlayerState->fullscreen() ) {
+        setBackgroundMode( QWidget::NoBackground );
+        showFullScreen();
+        resize( qApp->desktop()->size() );
+        slider->hide();
+        videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
+
+    } else {
+        showNormal();
+        showMaximized();
+        slider->show();
+        videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
+        qApp->processEvents();
+    }
 }
 
 
 void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );