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 | |
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 | |||
@@ -217,5 +217,5 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
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 | ||
@@ -344,5 +344,5 @@ 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 | } |
@@ -383,4 +383,4 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
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 | ||
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 | |||
@@ -109,3 +109,2 @@ private: | |||
109 | QLineEdit time; | 109 | QLineEdit time; |
110 | int xoff, yoff; | ||
111 | bool isStreaming : 1; | 110 | 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 | |||
@@ -73,2 +73,4 @@ protected: | |||
73 | QImage buttonMask; | 73 | QImage buttonMask; |
74 | |||
75 | QPoint upperLeftOfButtonMask; | ||
74 | }; | 76 | }; |
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 | |||
@@ -182,8 +182,8 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
182 | 182 | ||
183 | xoff = 0;// ( imgUp->width() ) / 2; | 183 | upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; |
184 | if(w>h) | 184 | if(w>h) |
185 | yoff = 0; | 185 | upperLeftOfButtonMask.ry() = 0; |
186 | else | 186 | else |
187 | yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 187 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
188 | QPoint p( xoff, yoff ); | 188 | QPoint p = upperLeftOfButtonMask; |
189 | 189 | ||
@@ -274,5 +274,5 @@ void VideoWidget::paintButton( QPainter *p, int i ) { | |||
274 | if ( buttons[i].isDown ) { | 274 | if ( buttons[i].isDown ) { |
275 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); | 275 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); |
276 | } else { | 276 | } else { |
277 | p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); | 277 | p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); |
278 | } | 278 | } |
@@ -284,4 +284,4 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
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() - xoff; | 285 | int x = event->pos().x() - upperLeftOfButtonMask.x(); |
286 | int y = event->pos().y() - yoff; | 286 | int y = event->pos().y() - upperLeftOfButtonMask.y(); |
287 | 287 | ||
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 | |||
@@ -107,3 +107,2 @@ private: | |||
107 | // QPixmap *pixmaps[4]; | 107 | // QPixmap *pixmaps[4]; |
108 | int xoff, yoff; | ||
109 | 108 | ||