author | simon <simon> | 2002-12-08 22:39:53 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 22:39:53 (UTC) |
commit | 8b72df0bb25ca5a0791756b2444fc6a1ce361082 (patch) (side-by-side diff) | |
tree | 19a7b23fe1d5256d461fe988ba82c359d75a8caf | |
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
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
5 files changed, 17 insertions, 17 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 * ) { time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); - xoff = ( w - imgUp.width() ) / 2; - yoff = (( h - imgUp.height() ) / 2) - 10; - QPoint p( xoff, yoff ); + upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; + upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; + QPoint p = upperLeftOfButtonMask; QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); @@ -343,7 +343,7 @@ void AudioWidget::toggleButton( int i ) { void AudioWidget::paintButton( QPainter *p, int i ) { if ( buttons[i].isDown ) { - p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); + p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); } else { - p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); + p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); } } @@ -382,6 +382,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { if ( event->state() == QMouseEvent::LeftButton ) { // The test to see if the mouse click is inside the button or not - int x = event->pos().x() - xoff; - int y = event->pos().y() - yoff; + int x = event->pos().x() - upperLeftOfButtonMask.x(); + int y = event->pos().y() - upperLeftOfButtonMask.y(); bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index da22946..acf2dda 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h @@ -108,5 +108,4 @@ private: QSlider slider; QLineEdit time; - int xoff, yoff; bool isStreaming : 1; }; diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 044ab6c..7e6cb3b 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -72,4 +72,6 @@ protected: QImage buttonMask; + + QPoint upperLeftOfButtonMask; }; diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 459f592..6ab6d7b 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -181,10 +181,10 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { slider->setBackgroundPixmap( pixBg ); - xoff = 0;// ( imgUp->width() ) / 2; + upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; if(w>h) - yoff = 0; + upperLeftOfButtonMask.ry() = 0; else - yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; - QPoint p( xoff, yoff ); + upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; + QPoint p = upperLeftOfButtonMask; QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); @@ -273,7 +273,7 @@ void VideoWidget::paintButton( QPainter *p, int i ) { if ( buttons[i].isDown ) { - p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); + p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); } else { - p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); + p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); } } @@ -283,6 +283,6 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { if ( event->state() == QMouseEvent::LeftButton ) { // The test to see if the mouse click is inside the button or not - int x = event->pos().x() - xoff; - int y = event->pos().y() - yoff; + int x = event->pos().x() - upperLeftOfButtonMask.x(); + int y = event->pos().y() - upperLeftOfButtonMask.y(); bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index a5500d7..2a9f1e0 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h @@ -106,5 +106,4 @@ private: QString skin; // QPixmap *pixmaps[4]; - int xoff, yoff; |