author | simon <simon> | 2002-12-09 18:33:53 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 18:33:53 (UTC) |
commit | 711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd (patch) (side-by-side diff) | |
tree | 20ad8855c3e9fcb0e0ec5a79b3d9e934236e1344 /noncore/multimedia/opieplayer2/videowidget.cpp | |
parent | 29b5784bba7b19497b5984418bacee261075ccf7 (diff) | |
download | opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.zip opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.tar.gz opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.tar.bz2 |
- another small cleanup in the mouse handling
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 26777e6..04b09f9 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -220,58 +220,54 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) // Effectively blank the view next time we show it so it looks nicer scaledWidth = 0; scaledHeight = 0; hide(); } void VideoWidget::updateSlider( long i, long max ) { // Will flicker too much if we don't do this if ( max == 0 ) { return; } int width = slider->width(); int val = int((double)i * width / max); if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { if ( slider->value() != val ) { slider->setValue( val ); } if ( slider->maxValue() != width ) { slider->setMaxValue( width ); } } } -void VideoWidget::mousePressEvent( QMouseEvent *event ) { - mouseMoveEvent( event ); -} - void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { if ( mediaPlayerState.isFullscreen() ) { mediaPlayerState.setFullscreen( FALSE ); makeVisible(); } - mouseMoveEvent( event ); + MediaWidget::mouseReleaseEvent( 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.isFullscreen() ) { setBackgroundMode( QWidget::NoBackground ); showFullScreen(); resize( qApp->desktop()->size() ); videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); slider->hide(); disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |