Diffstat (limited to 'core/multimedia/opieplayer/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index bb5f9e8..23b36e5 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -182,59 +182,60 @@ void VideoWidget::paintButton( QPainter *p, int i ) { | |||
182 | } | 182 | } |
183 | 183 | ||
184 | 184 | ||
185 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 185 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
186 | for ( int i = 0; i < numButtons; i++ ) { | 186 | for ( int i = 0; i < numButtons; i++ ) { |
187 | int x = videoButtons[i].xPos; | 187 | int x = videoButtons[i].xPos; |
188 | int y = videoButtons[i].yPos; | 188 | int y = videoButtons[i].yPos; |
189 | if ( event->state() == QMouseEvent::LeftButton ) { | 189 | if ( event->state() == QMouseEvent::LeftButton ) { |
190 | // The test to see if the mouse click is inside the circular button or not | 190 | // The test to see if the mouse click is inside the circular button or not |
191 | // (compared with the radius squared to avoid a square-root of our distance) | 191 | // (compared with the radius squared to avoid a square-root of our distance) |
192 | int radius = 16; | 192 | int radius = 16; |
193 | QPoint center = QPoint( x + radius, y + radius ); | 193 | QPoint center = QPoint( x + radius, y + radius ); |
194 | QPoint dXY = center - event->pos(); | 194 | QPoint dXY = center - event->pos(); |
195 | int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y(); | 195 | int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y(); |
196 | bool isOnButton = dist <= (radius * radius); | 196 | bool isOnButton = dist <= (radius * radius); |
197 | if ( isOnButton != videoButtons[i].isHeld ) { | 197 | if ( isOnButton != videoButtons[i].isHeld ) { |
198 | videoButtons[i].isHeld = isOnButton; | 198 | videoButtons[i].isHeld = isOnButton; |
199 | toggleButton(i); | 199 | toggleButton(i); |
200 | } | 200 | } |
201 | } else { | 201 | } else { |
202 | if ( videoButtons[i].isHeld ) { | 202 | if ( videoButtons[i].isHeld ) { |
203 | videoButtons[i].isHeld = FALSE; | 203 | videoButtons[i].isHeld = FALSE; |
204 | if ( !videoButtons[i].isToggle ) | 204 | if ( !videoButtons[i].isToggle ) |
205 | setToggleButton( i, FALSE ); | 205 | setToggleButton( i, FALSE ); |
206 | switch (i) { | ||
207 | case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return; | ||
208 | case VideoStop: mediaPlayerState->setPlaying(FALSE); return; | ||
209 | case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return; | ||
210 | case VideoNext: mediaPlayerState->setNext(); return; | ||
211 | case VideoPrevious: mediaPlayerState->setPrev(); return; | ||
212 | case VideoPlayList: mediaPlayerState->setList(); return; | ||
213 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | ||
214 | } | ||
215 | } | 206 | } |
216 | } | 207 | } |
208 | switch (i) { | ||
209 | case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return; | ||
210 | case VideoStop: mediaPlayerState->setPlaying(FALSE); return; | ||
211 | case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return; | ||
212 | case VideoNext: mediaPlayerState->setNext(); return; | ||
213 | case VideoPrevious: mediaPlayerState->setPrev(); return; | ||
214 | case VideoPlayList: mediaPlayerState->setList(); return; | ||
215 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | ||
216 | } | ||
217 | |||
217 | } | 218 | } |
218 | } | 219 | } |
219 | 220 | ||
220 | 221 | ||
221 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 222 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
222 | mouseMoveEvent( event ); | 223 | mouseMoveEvent( event ); |
223 | } | 224 | } |
224 | 225 | ||
225 | 226 | ||
226 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 227 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
227 | if ( mediaPlayerState->fullscreen() ) { | 228 | if ( mediaPlayerState->fullscreen() ) { |
228 | mediaPlayerState->setFullscreen( FALSE ); | 229 | mediaPlayerState->setFullscreen( FALSE ); |
229 | makeVisible(); | 230 | makeVisible(); |
230 | 231 | ||
231 | mouseMoveEvent( event ); | 232 | mouseMoveEvent( event ); |
232 | } | 233 | } |
233 | } | 234 | } |
234 | 235 | ||
235 | 236 | ||
236 | void VideoWidget::makeVisible() { | 237 | void VideoWidget::makeVisible() { |
237 | if ( mediaPlayerState->fullscreen() ) { | 238 | if ( mediaPlayerState->fullscreen() ) { |
238 | setBackgroundMode( QWidget::NoBackground ); | 239 | setBackgroundMode( QWidget::NoBackground ); |
239 | showFullScreen(); | 240 | showFullScreen(); |
240 | resize( qApp->desktop()->size() ); | 241 | resize( qApp->desktop()->size() ); |