Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 673c9e8..9782b68 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -244,13 +244,16 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
244 | 244 | ||
245 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 245 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
246 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 246 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
247 | |||
248 | Button &button = buttons[ i ]; | ||
249 | |||
247 | if ( event->state() == QMouseEvent::LeftButton ) { | 250 | if ( event->state() == QMouseEvent::LeftButton ) { |
248 | // The test to see if the mouse click is inside the button or not | 251 | // The test to see if the mouse click is inside the button or not |
249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 252 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
250 | 253 | ||
251 | if ( isOnButton && !buttons[i].isHeld ) { | 254 | if ( isOnButton && !button.isHeld ) { |
252 | buttons[i].isHeld = TRUE; | 255 | button.isHeld = TRUE; |
253 | toggleButton( buttons[ i ] ); | 256 | toggleButton( button ); |
254 | 257 | ||
255 | switch (i) { | 258 | switch (i) { |
256 | case VideoVolUp: | 259 | case VideoVolUp: |
@@ -260,27 +263,27 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
260 | emit lessClicked(); | 263 | emit lessClicked(); |
261 | return; | 264 | return; |
262 | } | 265 | } |
263 | } else if ( !isOnButton && buttons[i].isHeld ) { | 266 | } else if ( !isOnButton && button.isHeld ) { |
264 | buttons[i].isHeld = FALSE; | 267 | button.isHeld = FALSE; |
265 | toggleButton( buttons[ i ] ); | 268 | toggleButton( button ); |
266 | } | 269 | } |
267 | } else { | 270 | } else { |
268 | 271 | ||
269 | if ( buttons[i].isHeld ) { | 272 | if ( button.isHeld ) { |
270 | buttons[i].isHeld = FALSE; | 273 | button.isHeld = FALSE; |
271 | if ( buttons[i].type != ToggleButton ) { | 274 | if ( button.type != ToggleButton ) { |
272 | setToggleButton( buttons[ i ], FALSE ); | 275 | setToggleButton( button, FALSE ); |
273 | } | 276 | } |
274 | 277 | ||
275 | switch(i) { | 278 | switch(i) { |
276 | 279 | ||
277 | case VideoPlay: { | 280 | case VideoPlay: { |
278 | if( mediaPlayerState.isPaused() ) { | 281 | if( mediaPlayerState.isPaused() ) { |
279 | setToggleButton( buttons[ i ], FALSE ); | 282 | setToggleButton( button, FALSE ); |
280 | mediaPlayerState.setPaused( FALSE ); | 283 | mediaPlayerState.setPaused( FALSE ); |
281 | return; | 284 | return; |
282 | } else if( !mediaPlayerState.isPaused() ) { | 285 | } else if( !mediaPlayerState.isPaused() ) { |
283 | setToggleButton( buttons[ i ], TRUE ); | 286 | setToggleButton( button, TRUE ); |
284 | mediaPlayerState.setPaused( TRUE ); | 287 | mediaPlayerState.setPaused( TRUE ); |
285 | return; | 288 | return; |
286 | } else { | 289 | } else { |