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, 1 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 6ab6d7b..6451ac4 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -273,30 +273,25 @@ void VideoWidget::paintButton( QPainter *p, int i ) { | |||
273 | 273 | ||
274 | if ( buttons[i].isDown ) { | 274 | if ( buttons[i].isDown ) { |
275 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); | 275 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); |
276 | } else { | 276 | } else { |
277 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); | 277 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); |
278 | } | 278 | } |
279 | } | 279 | } |
280 | 280 | ||
281 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 281 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
282 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { | 282 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
283 | if ( event->state() == QMouseEvent::LeftButton ) { | 283 | if ( event->state() == QMouseEvent::LeftButton ) { |
284 | // The test to see if the mouse click is inside the button or not | 284 | // The test to see if the mouse click is inside the button or not |
285 | int x = event->pos().x() - upperLeftOfButtonMask.x(); | 285 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
286 | int y = event->pos().y() - upperLeftOfButtonMask.y(); | ||
287 | |||
288 | bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() | ||
289 | && y < buttonMask.height() | ||
290 | && buttonMask.pixelIndex( x, y ) == i + 1 ); | ||
291 | 286 | ||
292 | if ( isOnButton && !buttons[i].isHeld ) { | 287 | if ( isOnButton && !buttons[i].isHeld ) { |
293 | buttons[i].isHeld = TRUE; | 288 | buttons[i].isHeld = TRUE; |
294 | toggleButton(i); | 289 | toggleButton(i); |
295 | 290 | ||
296 | switch (i) { | 291 | switch (i) { |
297 | case VideoVolUp: | 292 | case VideoVolUp: |
298 | emit moreClicked(); | 293 | emit moreClicked(); |
299 | return; | 294 | return; |
300 | case VideoVolDown: | 295 | case VideoVolDown: |
301 | emit lessClicked(); | 296 | emit lessClicked(); |
302 | return; | 297 | return; |