summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp25
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp27
2 files changed, 29 insertions, 23 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index ef606ab..714509e 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -335,13 +335,16 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
for ( unsigned int i = 0; i < buttons.count(); i++ ) {
+
+ Button &button = buttons[ i ];
+
if ( event->state() == QMouseEvent::LeftButton ) {
// The test to see if the mouse click is inside the button or not
bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
- if ( isOnButton && !buttons[i].isHeld ) {
- buttons[i].isHeld = TRUE;
- toggleButton( buttons[ i ] );
+ if ( isOnButton && !button.isHeld ) {
+ button.isHeld = TRUE;
+ toggleButton( button );
switch (i) {
case VolumeUp:
emit moreClicked();
@@ -356,18 +359,18 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
emit backClicked();
return;
}
- } else if ( !isOnButton && buttons[i].isHeld ) {
- buttons[i].isHeld = FALSE;
- toggleButton( buttons[ i ] );
+ } else if ( !isOnButton && button.isHeld ) {
+ button.isHeld = FALSE;
+ toggleButton( button );
}
} else {
- if ( buttons[i].isHeld ) {
- buttons[i].isHeld = FALSE;
- if ( buttons[i].type != ToggleButton ) {
- setToggleButton( buttons[ i ], FALSE );
+ if ( button.isHeld ) {
+ button.isHeld = FALSE;
+ if ( button.type != ToggleButton ) {
+ setToggleButton( button, FALSE );
}
qDebug("mouseEvent %d", i);
- handleCommand( static_cast<Command>( i ), buttons[ i ].isDown );
+ handleCommand( static_cast<Command>( i ), button.isDown );
}
}
}
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 ) {
void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
for ( unsigned int i = 0; i < buttons.count(); i++ ) {
+
+ Button &button = buttons[ i ];
+
if ( event->state() == QMouseEvent::LeftButton ) {
// The test to see if the mouse click is inside the button or not
bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
- if ( isOnButton && !buttons[i].isHeld ) {
- buttons[i].isHeld = TRUE;
- toggleButton( buttons[ i ] );
+ if ( isOnButton && !button.isHeld ) {
+ button.isHeld = TRUE;
+ toggleButton( button );
switch (i) {
case VideoVolUp:
@@ -260,27 +263,27 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
emit lessClicked();
return;
}
- } else if ( !isOnButton && buttons[i].isHeld ) {
- buttons[i].isHeld = FALSE;
- toggleButton( buttons[ i ] );
+ } else if ( !isOnButton && button.isHeld ) {
+ button.isHeld = FALSE;
+ toggleButton( button );
}
} else {
- if ( buttons[i].isHeld ) {
- buttons[i].isHeld = FALSE;
- if ( buttons[i].type != ToggleButton ) {
- setToggleButton( buttons[ i ], FALSE );
+ if ( button.isHeld ) {
+ button.isHeld = FALSE;
+ if ( button.type != ToggleButton ) {
+ setToggleButton( button, FALSE );
}
switch(i) {
case VideoPlay: {
if( mediaPlayerState.isPaused() ) {
- setToggleButton( buttons[ i ], FALSE );
+ setToggleButton( button, FALSE );
mediaPlayerState.setPaused( FALSE );
return;
} else if( !mediaPlayerState.isPaused() ) {
- setToggleButton( buttons[ i ], TRUE );
+ setToggleButton( button, TRUE );
mediaPlayerState.setPaused( TRUE );
return;
} else {