Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index b0ec673..f5f5c37 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -375,50 +375,49 @@ void VideoWidget::showEvent( QShowEvent* ) { | |||
375 | void VideoWidget::backToNormal() { | 375 | void VideoWidget::backToNormal() { |
376 | mediaPlayerState->setFullscreen( FALSE ); | 376 | mediaPlayerState->setFullscreen( FALSE ); |
377 | makeVisible(); | 377 | makeVisible(); |
378 | } | 378 | } |
379 | 379 | ||
380 | void VideoWidget::makeVisible() { | 380 | void VideoWidget::makeVisible() { |
381 | if ( mediaPlayerState->fullscreen() ) { | 381 | if ( mediaPlayerState->fullscreen() ) { |
382 | setBackgroundMode( QWidget::NoBackground ); | 382 | setBackgroundMode( QWidget::NoBackground ); |
383 | showFullScreen(); | 383 | showFullScreen(); |
384 | resize( qApp->desktop()->size() ); | 384 | resize( qApp->desktop()->size() ); |
385 | slider->hide(); | 385 | slider->hide(); |
386 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 386 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
387 | qApp->processEvents(); | 387 | // qApp->processEvents(); |
388 | } else { | 388 | } else { |
389 | showNormal(); | 389 | showNormal(); |
390 | showMaximized(); | 390 | showMaximized(); |
391 | setBackgroundPixmap( *pixBg ); | 391 | setBackgroundPixmap( *pixBg ); |
392 | if ( mediaPlayerState->streaming() ) { | 392 | if ( mediaPlayerState->streaming() ) { |
393 | slider->hide(); | 393 | slider->hide(); |
394 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 394 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
395 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 395 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
396 | } else { | 396 | } else { |
397 | slider->show(); | 397 | slider->show(); |
398 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 398 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
399 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 399 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
400 | } | 400 | } |
401 | |||
402 | QWidget *d = QApplication::desktop(); | 401 | QWidget *d = QApplication::desktop(); |
403 | int w=d->width(); | 402 | int w=d->width(); |
404 | int h=d->height(); | 403 | int h=d->height(); |
405 | 404 | ||
406 | if(w>h) { | 405 | if(w>h) { |
407 | int newW=(w/2)-(246/2); //this will only work with 320x240 | 406 | int newW=(w/2)-(246/2); //this will only work with 320x240 |
408 | videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) ); | 407 | videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) ); |
409 | } else | 408 | } else |
410 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); | 409 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
411 | 410 | ||
412 | qApp->processEvents(); | 411 | // qApp->processEvents(); |
413 | } | 412 | } |
414 | } | 413 | } |
415 | 414 | ||
416 | 415 | ||
417 | void VideoWidget::paintEvent( QPaintEvent * pe) { | 416 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
418 | QPainter p( this ); | 417 | QPainter p( this ); |
419 | 418 | ||
420 | if ( mediaPlayerState->fullscreen() ) { | 419 | if ( mediaPlayerState->fullscreen() ) { |
421 | // Clear the background | 420 | // Clear the background |
422 | p.setBrush( QBrush( Qt::black ) ); | 421 | p.setBrush( QBrush( Qt::black ) ); |
423 | } else { | 422 | } else { |
424 | if ( !pe->erased() ) { | 423 | if ( !pe->erased() ) { |