Changeset 156 for smplayer/trunk/src/mplayerwindow.cpp

Timestamp:

Feb 21, 2014, 5:26:03 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.6

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mplayerwindow.cpp (modified) (3 diffs)

smplayer/trunk/src/mplayerwindow.cpp

@@ -182 +182 @@
 
         mplayerlayer = new MplayerLayer( this );
+        mplayerlayer->setObjectName("mplayerlayer");
         mplayerlayer->setAutoFillBackground(TRUE);
 
@@ -424 +425 @@
 }
 
-bool MplayerWindow::eventFilter( QObject * /*watched*/, QEvent * event ) {
-        //qDebug("MplayerWindow::eventFilter");
+bool MplayerWindow::eventFilter( QObject * watched, QEvent * event ) {
+        //qDebug("MplayerWindow::eventFilter: watched: %s", watched->objectName().toUtf8().constData());
 
         if ( (event->type() == QEvent::MouseMove) || 
@@ -433 +434 @@
 
                 if (event->type() == QEvent::MouseMove) {
-                        emit mouseMoved(mouse_event->pos());
+                        QPoint pos = mouse_event->pos();
+                        if (watched->objectName()=="mplayerlayer") {
+                                QWidget *widget = static_cast<QWidget *>(watched);
+                                pos = widget->mapToParent(pos);
+                        }
+                        emit mouseMoved(pos);
 
                         if ( mouse_event->buttons().testFlag(Qt::LeftButton)) {