Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 563ccf5..880b295 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -48,11 +48,10 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount | |||
48 | buttonMask = skin.buttonMask( skinInfo, buttonCount ); | 48 | buttonMask = skin.buttonMask( skinInfo, buttonCount ); |
49 | 49 | ||
50 | buttons.clear(); | 50 | buttons.clear(); |
51 | buttons.reserve( buttonCount ); | ||
52 | 51 | ||
53 | for ( uint i = 0; i < buttonCount; ++i ) { | 52 | for ( uint i = 0; i < buttonCount; ++i ) { |
54 | Button button = setupButton( skinInfo[ i ], skin ); | 53 | Button button = setupButton( skinInfo[ i ], skin ); |
55 | buttons.push_back( button ); | 54 | buttons.append( button ); |
56 | } | 55 | } |
57 | } | 56 | } |
58 | 57 | ||
@@ -87,16 +86,10 @@ void MediaWidget::closeEvent( QCloseEvent * ) | |||
87 | mediaPlayerState.setList(); | 86 | mediaPlayerState.setList(); |
88 | } | 87 | } |
89 | 88 | ||
90 | void MediaWidget::paintEvent( QPaintEvent *pe ) | 89 | void MediaWidget::paintEvent( QPaintEvent * ) |
91 | { | 90 | { |
92 | QPainter p( this ); | 91 | QPainter p( this ); |
93 | 92 | ||
94 | if ( mediaPlayerState.isFullscreen() ) { | ||
95 | // Clear the background | ||
96 | p.setBrush( QBrush( Qt::black ) ); | ||
97 | return; | ||
98 | } | ||
99 | |||
100 | QPixmap buffer( size() ); | 93 | QPixmap buffer( size() ); |
101 | QPainter bufferedPainter( &buffer ); | 94 | QPainter bufferedPainter( &buffer ); |
102 | bufferedPainter.drawTiledPixmap( rect(), backgroundPixmap, QPoint( 0, 0 ) ); | 95 | bufferedPainter.drawTiledPixmap( rect(), backgroundPixmap, QPoint( 0, 0 ) ); |
@@ -109,7 +102,7 @@ void MediaWidget::resizeEvent( QResizeEvent *e ) | |||
109 | QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, upperLeftOfButtonMask ); | 102 | QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, upperLeftOfButtonMask ); |
110 | QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, upperLeftOfButtonMask ); | 103 | QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, upperLeftOfButtonMask ); |
111 | 104 | ||
112 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { | 105 | for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) { |
113 | Button &button = *it; | 106 | Button &button = *it; |
114 | 107 | ||
115 | if ( button.mask.isNull() ) | 108 | if ( button.mask.isNull() ) |
@@ -129,8 +122,8 @@ MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position ) | |||
129 | return 0; | 122 | return 0; |
130 | 123 | ||
131 | int pixelIdx = buttonMask.pixelIndex( position.x(), position.y() ); | 124 | int pixelIdx = buttonMask.pixelIndex( position.x(), position.y() ); |
132 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) | 125 | for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) |
133 | if ( it->command + 1 == pixelIdx ) | 126 | if ( (*it).command + 1 == pixelIdx ) |
134 | return &( *it ); | 127 | return &( *it ); |
135 | 128 | ||
136 | return 0; | 129 | return 0; |
@@ -193,15 +186,15 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) | |||
193 | 186 | ||
194 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | 187 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const |
195 | { | 188 | { |
196 | return ( position.x() > 0 && position.y() > 0 && | 189 | return ( position.x() > 0 && position.y() > 0 && |
197 | position.x() < buttonMask.width() && | 190 | position.x() < buttonMask.width() && |
198 | position.y() < buttonMask.height() && | 191 | position.y() < buttonMask.height() && |
199 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); | 192 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); |
200 | } | 193 | } |
201 | 194 | ||
202 | void MediaWidget::paintAllButtons( QPainter &p ) | 195 | void MediaWidget::paintAllButtons( QPainter &p ) |
203 | { | 196 | { |
204 | for ( ButtonVector::const_iterator it = buttons.begin(); | 197 | for ( ButtonVector::ConstIterator it = buttons.begin(); |
205 | it != buttons.end(); ++it ) | 198 | it != buttons.end(); ++it ) |
206 | paintButton( p, *it ); | 199 | paintButton( p, *it ); |
207 | } | 200 | } |
@@ -222,8 +215,8 @@ void MediaWidget::paintButton( QPainter &p, const Button &button ) | |||
222 | 215 | ||
223 | void MediaWidget::setToggleButton( Command command, bool down ) | 216 | void MediaWidget::setToggleButton( Command command, bool down ) |
224 | { | 217 | { |
225 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) | 218 | for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) |
226 | if ( it->command == command ) { | 219 | if ( (*it).command == command ) { |
227 | setToggleButton( *it, down ); | 220 | setToggleButton( *it, down ); |
228 | return; | 221 | return; |
229 | } | 222 | } |