author | simon <simon> | 2002-12-08 22:39:53 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 22:39:53 (UTC) |
commit | 8b72df0bb25ca5a0791756b2444fc6a1ce361082 (patch) (unidiff) | |
tree | 19a7b23fe1d5256d461fe988ba82c359d75a8caf /noncore/multimedia/opieplayer2/audiowidget.cpp | |
parent | bada5d6377a428a96527d465903df7fbabc9d337 (diff) | |
download | opie-8b72df0bb25ca5a0791756b2444fc6a1ce361082.zip opie-8b72df0bb25ca5a0791756b2444fc6a1ce361082.tar.gz opie-8b72df0bb25ca5a0791756b2444fc6a1ce361082.tar.bz2 |
- merged xoff/yoff into a QPointe member variable, shared in the base class
Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 022aa82..4301a67 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -216,7 +216,7 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
216 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | 216 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); |
217 | 217 | ||
218 | xoff = ( w - imgUp.width() ) / 2; | 218 | upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; |
219 | yoff = (( h - imgUp.height() ) / 2) - 10; | 219 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; |
220 | QPoint p( xoff, yoff ); | 220 | QPoint p = upperLeftOfButtonMask; |
221 | 221 | ||
222 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); | 222 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); |
@@ -343,7 +343,7 @@ void AudioWidget::toggleButton( int i ) { | |||
343 | void AudioWidget::paintButton( QPainter *p, int i ) { | 343 | void AudioWidget::paintButton( QPainter *p, int i ) { |
344 | if ( buttons[i].isDown ) { | 344 | if ( buttons[i].isDown ) { |
345 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); | 345 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); |
346 | } else { | 346 | } else { |
347 | p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); | 347 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); |
348 | } | 348 | } |
349 | } | 349 | } |
@@ -382,6 +382,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
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() - xoff; | 384 | int x = event->pos().x() - upperLeftOfButtonMask.x(); |
385 | int y = event->pos().y() - yoff; | 385 | int y = event->pos().y() - upperLeftOfButtonMask.y(); |
386 | 386 | ||
387 | bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() | 387 | bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() |