summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-08 22:39:53 (UTC)
committer simon <simon>2002-12-08 22:39:53 (UTC)
commit8b72df0bb25ca5a0791756b2444fc6a1ce361082 (patch) (unidiff)
tree19a7b23fe1d5256d461fe988ba82c359d75a8caf
parentbada5d6377a428a96527d465903df7fbabc9d337 (diff)
downloadopie-8b72df0bb25ca5a0791756b2444fc6a1ce361082.zip
opie-8b72df0bb25ca5a0791756b2444fc6a1ce361082.tar.gz
opie-8b72df0bb25ca5a0791756b2444fc6a1ce361082.tar.bz2
- merged xoff/yoff into a QPointe member variable, shared in the base class
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
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
@@ -215,9 +215,9 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
215 slider.setBackgroundOrigin( QWidget::ParentOrigin ); 215 slider.setBackgroundOrigin( QWidget::ParentOrigin );
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 );
223 QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); 223 QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p );
@@ -342,9 +342,9 @@ void AudioWidget::toggleButton( int i ) {
342 342
343void AudioWidget::paintButton( QPainter *p, int i ) { 343void 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}
350 350
@@ -381,8 +381,8 @@ 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() - 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()
388 && y < buttonMask.height() 388 && y < buttonMask.height()
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
@@ -107,7 +107,6 @@ private:
107 OTicker songInfo; 107 OTicker songInfo;
108 QSlider slider; 108 QSlider slider;
109 QLineEdit time; 109 QLineEdit time;
110 int xoff, yoff;
111 bool isStreaming : 1; 110 bool isStreaming : 1;
112}; 111};
113 112
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
@@ -71,6 +71,8 @@ protected:
71 ButtonVector buttons; 71 ButtonVector buttons;
72 72
73 QImage buttonMask; 73 QImage buttonMask;
74
75 QPoint upperLeftOfButtonMask;
74}; 76};
75 77
76#endif // MEDIAWIDGET_H 78#endif // MEDIAWIDGET_H
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
@@ -180,12 +180,12 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
180 slider->setFocusPolicy( QWidget::NoFocus ); 180 slider->setFocusPolicy( QWidget::NoFocus );
181 slider->setBackgroundPixmap( pixBg ); 181 slider->setBackgroundPixmap( pixBg );
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
190 QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); 190 QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p );
191 QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p ); 191 QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p );
@@ -272,9 +272,9 @@ void VideoWidget::toggleButton( int i ) {
272void VideoWidget::paintButton( QPainter *p, int i ) { 272void VideoWidget::paintButton( QPainter *p, int i ) {
273 273
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 }
279} 279}
280 280
@@ -282,8 +282,8 @@ 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() - 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
288 bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width() 288 bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width()
289 && y < buttonMask.height() 289 && y < buttonMask.height()
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
@@ -105,7 +105,6 @@ private:
105 QPixmap *buttonPixDown[7]; 105 QPixmap *buttonPixDown[7];
106 QString skin; 106 QString skin;
107// QPixmap *pixmaps[4]; 107// QPixmap *pixmaps[4];
108 int xoff, yoff;
109 108
110 109
111 void paintButton( QPainter *p, int i ); 110 void paintButton( QPainter *p, int i );