Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 8fdb3d3..d3898a0 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -285,33 +285,34 @@ void VideoWidget::makeVisible() { | |||
285 | 285 | ||
286 | void VideoWidget::paintEvent( QPaintEvent * ) { | 286 | void VideoWidget::paintEvent( QPaintEvent * ) { |
287 | QPainter p( this ); | 287 | QPainter p( this ); |
288 | 288 | ||
289 | if ( mediaPlayerState->fullscreen() ) { | 289 | if ( mediaPlayerState->fullscreen() ) { |
290 | // Clear the background | 290 | // Clear the background |
291 | p.setBrush( QBrush( Qt::black ) ); | 291 | // p.setBrush( QBrush( Qt::black ) ); |
292 | p.drawRect( rect() ); | 292 | //p.drawRect( rect() ); |
293 | 293 | ||
294 | } else { | 294 | } else { |
295 | // draw border | 295 | // draw border |
296 | qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL ); | 296 | qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL ); |
297 | 297 | ||
298 | // Clear the movie screen first | 298 | // Clear the movie screen first |
299 | p.setBrush( QBrush( Qt::black ) ); | 299 | // p.setBrush( QBrush( Qt::black ) ); |
300 | p.drawRect( 9, 20, 220, 160 ); | 300 | // p.drawRect( 9, 20, 220, 160 ); |
301 | 301 | ||
302 | // draw current frame (centrally positioned from scaling to maintain aspect ratio) | 302 | // draw current frame (centrally positioned from scaling to maintain aspect ratio) |
303 | //p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight ); | 303 | //p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight ); |
304 | 304 | ||
305 | // draw the buttons | 305 | // draw the buttons |
306 | for ( int i = 0; i < numButtons; i++ ) { | 306 | for ( int i = 0; i < numButtons; i++ ) { |
307 | paintButton( &p, i ); | 307 | paintButton( &p, i ); |
308 | } | 308 | } |
309 | 309 | ||
310 | // draw the slider | 310 | // draw the slider |
311 | slider->repaint( TRUE ); | 311 | slider->repaint( TRUE ); |
312 | //videoFrame->repaint( TRUE ); | ||
312 | } | 313 | } |
313 | } | 314 | } |
314 | 315 | ||
315 | 316 | ||
316 | void VideoWidget::closeEvent( QCloseEvent* ) { | 317 | void VideoWidget::closeEvent( QCloseEvent* ) { |
317 | mediaPlayerState->setList(); | 318 | mediaPlayerState->setList(); |
@@ -379,6 +380,9 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) | |||
379 | break; | 380 | break; |
380 | case Key_Escape: | 381 | case Key_Escape: |
381 | break; | 382 | break; |
382 | 383 | ||
383 | }; | 384 | }; |
384 | } | 385 | } |
386 | XineVideoWidget* VideoWidget::vidWidget() { | ||
387 | return videoFrame; | ||
388 | } | ||