summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 18:33:53 (UTC)
committer simon <simon>2002-12-09 18:33:53 (UTC)
commit711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd (patch) (unidiff)
tree20ad8855c3e9fcb0e0ec5a79b3d9e934236e1344
parent29b5784bba7b19497b5984418bacee261075ccf7 (diff)
downloadopie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.zip
opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.tar.gz
opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.tar.bz2
- another small cleanup in the mouse handling
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
6 files changed, 13 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index dda039c..5986a72 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -333,16 +333,6 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
333 } 333 }
334} 334}
335 335
336void AudioWidget::mousePressEvent( QMouseEvent *event ) {
337 mouseMoveEvent( event );
338}
339
340
341void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
342 mouseMoveEvent( event );
343}
344
345
346void AudioWidget::showEvent( QShowEvent* ) { 336void AudioWidget::showEvent( QShowEvent* ) {
347 QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); 337 QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
348 mouseMoveEvent( &event ); 338 mouseMoveEvent( &event );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 690d1b3..e2e2314 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -76,8 +76,6 @@ protected:
76 void doUnblank(); 76 void doUnblank();
77 void showEvent( QShowEvent *se ); 77 void showEvent( QShowEvent *se );
78 void resizeEvent( QResizeEvent *re ); 78 void resizeEvent( QResizeEvent *re );
79 void mousePressEvent( QMouseEvent *event );
80 void mouseReleaseEvent( QMouseEvent *event );
81 void timerEvent( QTimerEvent *event ); 79 void timerEvent( QTimerEvent *event );
82 void keyReleaseEvent( QKeyEvent *e); 80 void keyReleaseEvent( QKeyEvent *e);
83private slots: 81private slots:
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 3533d74..439ba2e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -113,6 +113,16 @@ void MediaWidget::mouseMoveEvent( QMouseEvent *event )
113 } 113 }
114} 114}
115 115
116void MediaWidget::mousePressEvent( QMouseEvent *event )
117{
118 mouseMoveEvent( event );
119}
120
121void MediaWidget::mouseReleaseEvent( QMouseEvent *event )
122{
123 mouseMoveEvent( event );
124}
125
116void MediaWidget::makeVisible() 126void MediaWidget::makeVisible()
117{ 127{
118} 128}
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index c261728..9042d5b 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -88,6 +88,8 @@ protected:
88 virtual void paintEvent( QPaintEvent *pe ); 88 virtual void paintEvent( QPaintEvent *pe );
89 89
90 virtual void mouseMoveEvent( QMouseEvent *event ); 90 virtual void mouseMoveEvent( QMouseEvent *event );
91 virtual void mousePressEvent( QMouseEvent *event );
92 virtual void mouseReleaseEvent( QMouseEvent *event );
91 93
92 virtual void makeVisible(); 94 virtual void makeVisible();
93 95
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 26777e6..04b09f9 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -241,16 +241,12 @@ void VideoWidget::updateSlider( long i, long max ) {
241 } 241 }
242} 242}
243 243
244void VideoWidget::mousePressEvent( QMouseEvent *event ) {
245 mouseMoveEvent( event );
246}
247
248void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { 244void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
249 if ( mediaPlayerState.isFullscreen() ) { 245 if ( mediaPlayerState.isFullscreen() ) {
250 mediaPlayerState.setFullscreen( FALSE ); 246 mediaPlayerState.setFullscreen( FALSE );
251 makeVisible(); 247 makeVisible();
252 } 248 }
253 mouseMoveEvent( event ); 249 MediaWidget::mouseReleaseEvent( event );
254} 250}
255 251
256void VideoWidget::showEvent( QShowEvent* ) { 252void VideoWidget::showEvent( QShowEvent* ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index bed2116..985c094 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -76,7 +76,6 @@ protected:
76 76
77 void resizeEvent( QResizeEvent * ); 77 void resizeEvent( QResizeEvent * );
78 void showEvent( QShowEvent *se ); 78 void showEvent( QShowEvent *se );
79 void mousePressEvent( QMouseEvent *event );
80 void mouseReleaseEvent( QMouseEvent *event ); 79 void mouseReleaseEvent( QMouseEvent *event );
81 void keyReleaseEvent( QKeyEvent *e); 80 void keyReleaseEvent( QKeyEvent *e);
82 81