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

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/mplayerwindow.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -130 +130 @@
         #endif
         setAttribute(Qt::WA_PaintUnclipped);
-        setAttribute(Qt::WA_PaintOnScreen);
+        //setAttribute(Qt::WA_PaintOnScreen);
         #endif
 #endif
@@ -161 +161 @@
 
 #ifndef Q_OS_WIN
-        #if QT_VERSION >= 0x050000
         setAttribute(Qt::WA_PaintOnScreen);
-        #endif
 #endif
 
@@ -174 +172 @@
 
 #ifndef Q_OS_WIN
-        #if QT_VERSION >= 0x050000
         setAttribute(Qt::WA_PaintOnScreen, false);
-        #endif
 #endif
 
@@ -210 +206 @@
         , animated_logo(false)
 #endif
-        , mouse_drag_tracking(false)
-        , isMoving(false)
-        , startDrag(QPoint(0,0))
+        , corner_widget(0)
+    , drag_state(NOT_DRAGGING)
+    , start_drag(QPoint(0,0))
+    , mouse_drag_tracking(false)
 {
         setAutoFillBackground(true);
@@ -254 +251 @@
 }
 
+void MplayerWindow::setCornerWidget(QWidget * w) {
+        corner_widget = w;
+
+        QHBoxLayout * blayout = new QHBoxLayout;
+        blayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
+        blayout->addWidget(corner_widget);
+
+        QVBoxLayout * layout = new QVBoxLayout(this);
+        layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding));
+        layout->addLayout(blayout);
+}
+
 #if USE_COLORKEY
 void MplayerWindow::setColorKey( QColor c ) {
@@ -268 +277 @@
 
 void MplayerWindow::setLogoVisible( bool b) {
+        if (corner_widget) {
+                corner_widget->setVisible(b);
+        }
+
 #if !LOGO_ANIMATION
         logo->setVisible(b);
@@ -468 +481 @@
 }
 
-/* the code in eventFilter is based on dragmovecharm.cpp, under license GPL 2 or 3:
-   https://qt.gitorious.org/qt-labs/graphics-dojo/source/8000ca3b229344ed2ba2ae81ed5ebaee86e9d63a:dragmove/dragmovecharm.cpp
-*/
 bool MplayerWindow::eventFilter( QObject * object, QEvent * event ) {
-        //qDebug() << "MplayerWindow::eventFilter" << object;
-
-        if (!mouse_drag_tracking) return false;
-
-        QWidget * w = qobject_cast<QWidget*>(object);
-        if (!w) return false;
-
-        QEvent::Type type = event->type();
-        if (type != QEvent::MouseButtonPress && type != QEvent::MouseButtonRelease && type != QEvent::MouseMove) {
-                return false;
-        }
-
-        QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
-        if (!mouseEvent || mouseEvent->modifiers() != Qt::NoModifier) {
-                return false;
-        }
-        Qt::MouseButton button = mouseEvent->button();
-
-        bool consumed = false;
-
-        if (type == QEvent::MouseButtonPress && button == Qt::LeftButton) {
-                startDrag = mouseEvent->globalPos();
-                //qDebug() << "MplayerWindow::eventFilter: startDrag:" << startDrag << "obj:" << object->objectName();
-                isMoving = true;
-                event->accept();
-                consumed = true;
-        }
-
-        if (type == QEvent::MouseButtonRelease) {
-                startDrag = QPoint(0, 0);
-                isMoving = false;
-        }
-
-        if (type == QEvent::MouseMove && isMoving) {
-                QPoint pos = mouseEvent->globalPos();
-                QPoint diff = pos - startDrag;
-                //qDebug() << "MplayerWindow:eventFilter: diff" << diff << "obj:" << object->objectName();
-                emit mouseMovedDiff(diff);
-                startDrag = pos;
-                consumed = true;
-        }
-
-        return consumed;
+
+    if (!mouse_drag_tracking)
+        return false;
+
+    QEvent::Type type = event->type();
+    if (type != QEvent::MouseButtonPress
+        && type != QEvent::MouseButtonRelease
+        && type != QEvent::MouseMove)
+        return false;
+
+    QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
+    if (!mouseEvent)
+        return false;
+
+    if (mouseEvent->modifiers() != Qt::NoModifier) {
+        drag_state = NOT_DRAGGING;
+        return false;
+    }
+
+    if (type == QEvent::MouseButtonPress) {
+        if (mouseEvent->button() != Qt::LeftButton) {
+            drag_state = NOT_DRAGGING;
+            return false;
+        }
+
+        drag_state = START_DRAGGING;
+        start_drag = mouseEvent->globalPos();
+        // Don't filter, so others can have a look at it too
+        return false;
+    }
+
+    if (type == QEvent::MouseButtonRelease) {
+        if (drag_state != DRAGGING || mouseEvent->button() != Qt::LeftButton) {
+            drag_state = NOT_DRAGGING;
+            return false;
+        }
+
+        // Stop dragging and eat event
+        drag_state = NOT_DRAGGING;
+        event->accept();
+        return true;
+    }
+
+    // type == QEvent::MouseMove
+    if (drag_state == NOT_DRAGGING)
+        return false;
+
+    // buttons() note the s
+    if (mouseEvent->buttons() != Qt::LeftButton) {
+        drag_state = NOT_DRAGGING;
+        return false;
+    }
+
+    QPoint pos = mouseEvent->globalPos();
+    QPoint diff = pos - start_drag;
+    if (drag_state == START_DRAGGING) {
+        // Don't start dragging before moving at least DRAG_THRESHOLD pixels
+        if (abs(diff.x()) < DRAG_THRESHOLD && abs(diff.y()) < DRAG_THRESHOLD)
+            return false;
+
+        drag_state = DRAGGING;
+    }
+
+    emit mouseMovedDiff(diff);
+    start_drag = pos;
+    event->accept();
+    return true;
 }