author | llornkcor <llornkcor> | 2002-08-15 16:42:08 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-15 16:42:08 (UTC) |
commit | 71520dfe386a04f8bce5d6f5d9d86dcbeda000d2 (patch) (unidiff) | |
tree | 78a284abbce1cc1da57b78f39e9e47fe5271cc1c | |
parent | 07ea5f165a2f17f818147b2e8afb02af2c269b55 (diff) | |
download | opie-71520dfe386a04f8bce5d6f5d9d86dcbeda000d2.zip opie-71520dfe386a04f8bce5d6f5d9d86dcbeda000d2.tar.gz opie-71520dfe386a04f8bce5d6f5d9d86dcbeda000d2.tar.bz2 |
fix rightmouse hold
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index fbcd775..f5780aa 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -313,47 +313,42 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
313 | && imgButtonMask->pixelIndex( x, y ) == i + 1 ); | 313 | && imgButtonMask->pixelIndex( x, y ) == i + 1 ); |
314 | 314 | ||
315 | if ( isOnButton && !videoButtons[i].isHeld ) { | 315 | if ( isOnButton && !videoButtons[i].isHeld ) { |
316 | videoButtons[i].isHeld = TRUE; | 316 | videoButtons[i].isHeld = TRUE; |
317 | toggleButton(i); | 317 | toggleButton(i); |
318 | 318 | ||
319 | switch (i) { | 319 | switch (i) { |
320 | case VideoVolUp: | 320 | case VideoVolUp: |
321 | qDebug("more clicked"); | ||
322 | emit moreClicked(); | 321 | emit moreClicked(); |
323 | return; | 322 | return; |
324 | case VideoVolDown: | 323 | case VideoVolDown: |
325 | qDebug("less clicked"); | ||
326 | emit lessClicked(); | 324 | emit lessClicked(); |
327 | return; | 325 | return; |
328 | } | 326 | } |
329 | } else if ( !isOnButton && videoButtons[i].isHeld ) { | 327 | } else if ( !isOnButton && videoButtons[i].isHeld ) { |
330 | videoButtons[i].isHeld = FALSE; | 328 | videoButtons[i].isHeld = FALSE; |
331 | toggleButton(i); | 329 | toggleButton(i); |
332 | } | 330 | } |
333 | } else { | 331 | } else { |
334 | 332 | ||
335 | if ( videoButtons[i].isHeld ) { | 333 | if ( videoButtons[i].isHeld ) { |
336 | videoButtons[i].isHeld = FALSE; | 334 | videoButtons[i].isHeld = FALSE; |
337 | if ( !videoButtons[i].isToggle ) { | 335 | if ( !videoButtons[i].isToggle ) { |
338 | setToggleButton( i, FALSE ); | 336 | setToggleButton( i, FALSE ); |
339 | qDebug("button toggled3 %d",i); | ||
340 | } | 337 | } |
341 | 338 | ||
342 | switch(i) { | 339 | switch(i) { |
343 | 340 | ||
344 | case VideoPlay: { | 341 | case VideoPlay: { |
345 | if( mediaPlayerState->isPaused ) { | 342 | if( mediaPlayerState->isPaused ) { |
346 | qDebug("play again clicked"); | ||
347 | setToggleButton( i, FALSE ); | 343 | setToggleButton( i, FALSE ); |
348 | mediaPlayerState->setPaused( FALSE ); | 344 | mediaPlayerState->setPaused( FALSE ); |
349 | return; | 345 | return; |
350 | } else if( !mediaPlayerState->isPaused ) { | 346 | } else if( !mediaPlayerState->isPaused ) { |
351 | qDebug("pause now clicked"); | ||
352 | setToggleButton( i, TRUE ); | 347 | setToggleButton( i, TRUE ); |
353 | mediaPlayerState->setPaused( TRUE ); | 348 | mediaPlayerState->setPaused( TRUE ); |
354 | return; | 349 | return; |
355 | } else { | 350 | } else { |
356 | // setToggleButton( i, TRUE ); | 351 | // setToggleButton( i, TRUE ); |
357 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); | 352 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); |
358 | } | 353 | } |
359 | } | 354 | } |
@@ -374,19 +369,18 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
374 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 369 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
375 | mouseMoveEvent( event ); | 370 | mouseMoveEvent( event ); |
376 | } | 371 | } |
377 | 372 | ||
378 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 373 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
379 | if ( mediaPlayerState->fullscreen() ) { | 374 | if ( mediaPlayerState->fullscreen() ) { |
380 | mediaPlayerState->setFullscreen( FALSE ); | 375 | mediaPlayerState->setFullscreen( FALSE ); |
381 | makeVisible(); | 376 | makeVisible(); |
382 | |||
383 | mouseMoveEvent( event ); | ||
384 | } | 377 | } |
378 | mouseMoveEvent( event ); | ||
385 | } | 379 | } |
386 | 380 | ||
387 | void VideoWidget::showEvent( QShowEvent* ) { | 381 | void VideoWidget::showEvent( QShowEvent* ) { |
388 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 382 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
389 | mouseMoveEvent( &event ); | 383 | mouseMoveEvent( &event ); |
390 | } | 384 | } |
391 | 385 | ||
392 | 386 | ||