author | simon <simon> | 2002-12-11 13:46:15 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 13:46:15 (UTC) |
commit | 2b3c450378c1da0a2175c91d652ce2eae5614ff8 (patch) (unidiff) | |
tree | 4c11c70dbf487725f6e443f5db4c5a0a0c964e61 /noncore/multimedia/opieplayer2 | |
parent | cd5e96b40ceae9158e5cb01e71769e895ea7a3c1 (diff) | |
download | opie-2b3c450378c1da0a2175c91d652ce2eae5614ff8.zip opie-2b3c450378c1da0a2175c91d652ce2eae5614ff8.tar.gz opie-2b3c450378c1da0a2175c91d652ce2eae5614ff8.tar.bz2 |
- less code duplication. code from resizeEvent is now shared as well as
the image composing method and the pixmap mask helper
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 33 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 32 |
4 files changed, 42 insertions, 41 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index bb686f1..bb07882 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -130,7 +130,7 @@ QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) { | |||
130 | 130 | ||
131 | }; | 131 | }; |
132 | 132 | ||
133 | void AudioWidget::resizeEvent( QResizeEvent * ) { | 133 | void AudioWidget::resizeEvent( QResizeEvent *e ) { |
134 | int h = height(); | 134 | int h = height(); |
135 | int w = width(); | 135 | int w = width(); |
136 | 136 | ||
@@ -142,17 +142,8 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
142 | 142 | ||
143 | upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2; | 143 | upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2; |
144 | upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10; | 144 | upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10; |
145 | QPoint p = upperLeftOfButtonMask; | ||
146 | 145 | ||
147 | QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, p ); | 146 | MediaWidget::resizeEvent( e ); |
148 | QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, p ); | ||
149 | |||
150 | for ( uint i = 0; i < buttons.size(); i++ ) { | ||
151 | if ( !buttons[i].mask.isNull() ) { | ||
152 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); | ||
153 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); | ||
154 | } | ||
155 | } | ||
156 | } | 147 | } |
157 | 148 | ||
158 | void AudioWidget::sliderPressed() { | 149 | void AudioWidget::sliderPressed() { |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index ab23aa8..ab2ec50 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -109,6 +109,23 @@ void MediaWidget::paintEvent( QPaintEvent *pe ) | |||
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | void MediaWidget::resizeEvent( QResizeEvent *e ) | ||
113 | { | ||
114 | QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, upperLeftOfButtonMask ); | ||
115 | QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, upperLeftOfButtonMask ); | ||
116 | |||
117 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { | ||
118 | Button &button = *it; | ||
119 | |||
120 | if ( button.mask.isNull() ) | ||
121 | continue; | ||
122 | button.pixUp = addMaskToPixmap( pixUp, button.mask ); | ||
123 | button.pixDown = addMaskToPixmap( pixDn, button.mask ); | ||
124 | } | ||
125 | |||
126 | QWidget::resizeEvent( e ); | ||
127 | } | ||
128 | |||
112 | MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position ) | 129 | MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position ) |
113 | { | 130 | { |
114 | if ( position.x() <= 0 || position.y() <= 0 || | 131 | if ( position.x() <= 0 || position.y() <= 0 || |
@@ -230,5 +247,21 @@ void MediaWidget::toggleButton( Button &button ) | |||
230 | paintButton( button ); | 247 | paintButton( button ); |
231 | } | 248 | } |
232 | 249 | ||
250 | QPixmap MediaWidget::combineImageWithBackground( const QImage &image, const QPixmap &background, const QPoint &offset ) | ||
251 | { | ||
252 | QPixmap pix( image.size() ); | ||
253 | QPainter p( &pix ); | ||
254 | p.drawTiledPixmap( pix.rect(), background, offset ); | ||
255 | p.drawImage( 0, 0, image ); | ||
256 | return pix; | ||
257 | } | ||
258 | |||
259 | QPixmap MediaWidget::addMaskToPixmap( const QPixmap &pix, const QBitmap &mask ) | ||
260 | { | ||
261 | QPixmap result( pix ); | ||
262 | result.setMask( mask ); | ||
263 | return result; | ||
264 | } | ||
265 | |||
233 | /* vim: et sw=4 ts=4 | 266 | /* vim: et sw=4 ts=4 |
234 | */ | 267 | */ |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 9f13677..4599637 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -112,6 +112,8 @@ protected: | |||
112 | 112 | ||
113 | virtual void paintEvent( QPaintEvent *pe ); | 113 | virtual void paintEvent( QPaintEvent *pe ); |
114 | 114 | ||
115 | virtual void resizeEvent( QResizeEvent *e ); | ||
116 | |||
115 | Button *buttonAt( const QPoint &position ); | 117 | Button *buttonAt( const QPoint &position ); |
116 | 118 | ||
117 | virtual void mousePressEvent( QMouseEvent *event ); | 119 | virtual void mousePressEvent( QMouseEvent *event ); |
@@ -143,6 +145,9 @@ protected: | |||
143 | QPixmap backgroundPixmap; | 145 | QPixmap backgroundPixmap; |
144 | QImage buttonUpImage; | 146 | QImage buttonUpImage; |
145 | QImage buttonDownImage; | 147 | QImage buttonDownImage; |
148 | |||
149 | static QPixmap combineImageWithBackground( const QImage &background, const QPixmap &pixmap, const QPoint &offset ); | ||
150 | static QPixmap addMaskToPixmap( const QPixmap &pix, const QBitmap &mask ); | ||
146 | }; | 151 | }; |
147 | 152 | ||
148 | #endif // MEDIAWIDGET_H | 153 | #endif // MEDIAWIDGET_H |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index bc47717..a8ff540 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -99,21 +99,7 @@ VideoWidget::~VideoWidget() | |||
99 | { | 99 | { |
100 | } | 100 | } |
101 | 101 | ||
102 | QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 102 | void VideoWidget::resizeEvent( QResizeEvent *e ) { |
103 | QPixmap pix( img.width(), img.height() ); | ||
104 | QPainter p( &pix ); | ||
105 | p.drawTiledPixmap( pix.rect(), bg, offset ); | ||
106 | p.drawImage( 0, 0, img ); | ||
107 | return new QPixmap( pix ); | ||
108 | } | ||
109 | |||
110 | QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) { | ||
111 | QPixmap pixmap( pix ); | ||
112 | pixmap.setMask( mask ); | ||
113 | return pixmap; | ||
114 | } | ||
115 | |||
116 | void VideoWidget::resizeEvent( QResizeEvent * ) { | ||
117 | int h = height(); | 103 | int h = height(); |
118 | int w = width(); | 104 | int w = width(); |
119 | //int Vh = 160; | 105 | //int Vh = 160; |
@@ -130,22 +116,8 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
130 | upperLeftOfButtonMask.ry() = 0; | 116 | upperLeftOfButtonMask.ry() = 0; |
131 | else | 117 | else |
132 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 118 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
133 | QPoint p = upperLeftOfButtonMask; | ||
134 | |||
135 | QPixmap *pixUp = combineVImageWithBackground( buttonUpImage, backgroundPixmap, p ); | ||
136 | QPixmap *pixDn = combineVImageWithBackground( buttonDownImage, backgroundPixmap, p ); | ||
137 | |||
138 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { | ||
139 | Button &button = *it; | ||
140 | |||
141 | if ( !button.mask.isNull() ) { | ||
142 | button.pixUp = maskVPixToMask( *pixUp, button.mask ); | ||
143 | button.pixDown = maskVPixToMask( *pixDn, button.mask ); | ||
144 | } | ||
145 | } | ||
146 | 119 | ||
147 | delete pixUp; | 120 | MediaWidget::resizeEvent( e ); |
148 | delete pixDn; | ||
149 | } | 121 | } |
150 | 122 | ||
151 | void VideoWidget::sliderPressed() { | 123 | void VideoWidget::sliderPressed() { |