author | simon <simon> | 2002-12-08 22:47:39 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 22:47:39 (UTC) |
commit | 786bc677f61983414df8a4613cc525c4bcd2a054 (patch) (unidiff) | |
tree | c39a2a1691ffc8d813a496cb47c00b8ede47ea30 | |
parent | 8b72df0bb25ca5a0791756b2444fc6a1ce361082 (diff) | |
download | opie-786bc677f61983414df8a4613cc525c4bcd2a054.zip opie-786bc677f61983414df8a4613cc525c4bcd2a054.tar.gz opie-786bc677f61983414df8a4613cc525c4bcd2a054.tar.bz2 |
- moved the duplicated code for checking whether the mouse is over a
button into a shared isOverButton method
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 7 |
4 files changed, 12 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 4301a67..d083273 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -378,18 +378,13 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
378 | 378 | ||
379 | 379 | ||
380 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | 380 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { |
381 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { | 381 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
382 | if ( event->state() == QMouseEvent::LeftButton ) { | 382 | if ( event->state() == QMouseEvent::LeftButton ) { |
383 | // The test to see if the mouse click is inside the button or not | 383 | // The test to see if the mouse click is inside the button or not |
384 | int x = event->pos().x() - upperLeftOfButtonMask.x(); | 384 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
385 | int y = event->pos().y() - upperLeftOfButtonMask.y(); | ||
386 | |||
387 | bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() | ||
388 | && y < buttonMask.height() | ||
389 | && buttonMask.pixelIndex( x, y ) == i + 1 ); | ||
390 | 385 | ||
391 | if ( isOnButton && !buttons[i].isHeld ) { | 386 | if ( isOnButton && !buttons[i].isHeld ) { |
392 | buttons[i].isHeld = TRUE; | 387 | buttons[i].isHeld = TRUE; |
393 | toggleButton(i); | 388 | toggleButton(i); |
394 | switch (i) { | 389 | switch (i) { |
395 | case VolumeUp: | 390 | case VolumeUp: |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index a1b292e..1d18d6f 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -57,8 +57,16 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) | |||
57 | case PlayList: mediaPlayerState.setList(); return; | 57 | case PlayList: mediaPlayerState.setList(); return; |
58 | case Forward: emit forwardReleased(); return; | 58 | case Forward: emit forwardReleased(); return; |
59 | case Back: emit backReleased(); return; | 59 | case Back: emit backReleased(); return; |
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | ||
64 | { | ||
65 | return ( position.x() > 0 && position.y() > 0 && | ||
66 | position.x() < buttonMask.width() && | ||
67 | position.y() < buttonMask.height() && | ||
68 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); | ||
69 | } | ||
70 | |||
63 | /* vim: et sw=4 ts=4 | 71 | /* vim: et sw=4 ts=4 |
64 | */ | 72 | */ |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 7e6cb3b..6e12a3b 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -62,12 +62,14 @@ signals: | |||
62 | 62 | ||
63 | protected: | 63 | protected: |
64 | virtual void closeEvent( QCloseEvent * ); | 64 | virtual void closeEvent( QCloseEvent * ); |
65 | 65 | ||
66 | void handleCommand( Command command, bool buttonDown ); | 66 | void handleCommand( Command command, bool buttonDown ); |
67 | 67 | ||
68 | bool isOverButton( const QPoint &position, int buttonId ) const; | ||
69 | |||
68 | MediaPlayerState &mediaPlayerState; | 70 | MediaPlayerState &mediaPlayerState; |
69 | PlayListWidget &playList; | 71 | PlayListWidget &playList; |
70 | 72 | ||
71 | ButtonVector buttons; | 73 | ButtonVector buttons; |
72 | 74 | ||
73 | QImage buttonMask; | 75 | QImage buttonMask; |
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 | |||
@@ -279,18 +279,13 @@ void VideoWidget::paintButton( QPainter *p, int i ) { | |||
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) { |