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

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/mplayerwindow.cpp

@@ -41 +41 @@
 #endif
 
+//#define HANDLE_GESTURES
+
+#ifdef HANDLE_GESTURES
+#include <QGestureEvent>
+#include <QTapGesture>
+#endif
+
 Screen::Screen(QWidget* parent, Qt::WindowFlags f)
         : QWidget(parent, f )
@@ -123 +130 @@
         , playing(false)
 {
-#ifndef Q_OS_WIN
-        #if QT_VERSION < 0x050000
-        setAttribute(Qt::WA_OpaquePaintEvent);
-        #if QT_VERSION >= 0x040400
-        setAttribute(Qt::WA_NativeWindow);
-        #endif
-        setAttribute(Qt::WA_PaintUnclipped);
-        //setAttribute(Qt::WA_PaintOnScreen);
-        #endif
-#endif
 }
 
@@ -143 +140 @@
         repaint_background = b;
 }
-
-void MplayerLayer::paintEvent( QPaintEvent * e ) {
-        //qDebug("MplayerLayer::paintEvent: repaint_background: %d", repaint_background);
-        if (repaint_background || !playing) {
-                //qDebug("MplayerLayer::paintEvent: painting");
-                QPainter painter(this);
-                painter.eraseRect( e->rect() );
-                //painter.fillRect( e->rect(), QColor(255,0,0) );
-        }
-}
 #endif
 
 void MplayerLayer::playingStarted() {
         qDebug("MplayerLayer::playingStarted");
-        repaint();
+//      repaint();
         playing = true;
 
 #ifndef Q_OS_WIN
-        setAttribute(Qt::WA_PaintOnScreen);
+        if (!repaint_background) setUpdatesEnabled(false);
 #endif
 
@@ -172 +159 @@
 
 #ifndef Q_OS_WIN
-        setAttribute(Qt::WA_PaintOnScreen, false);
-#endif
-
-        repaint();
+        setUpdatesEnabled(true);
+#endif
+
+//      repaint();
         Screen::playingStopped();
 }
@@ -211 +198 @@
     , mouse_drag_tracking(false)
 {
+        mplayerlayer = new MplayerLayer(this);
+        mplayerlayer->setObjectName("mplayerlayer");
+
+        logo = new QLabel( mplayerlayer );
+        logo->setObjectName("mplayerwindowlogo");
+
+        // Set colors
+#ifdef CHANGE_WIDGET_COLOR
         setAutoFillBackground(true);
         ColorUtils::setBackgroundColor( this, QColor(0,0,0) );
-
-        mplayerlayer = new MplayerLayer(this);
-        mplayerlayer->setObjectName("mplayerlayer");
         mplayerlayer->setAutoFillBackground(true);
-
-        logo = new QLabel( mplayerlayer );
-        logo->setObjectName("mplayerwindow logo");
         logo->setAutoFillBackground(true);
         ColorUtils::setBackgroundColor( logo, QColor(0,0,0) );
+#else
+        setStyleSheet("MplayerWindow { background-color: black;}");
+        mplayerlayer->setStyleSheet("background-color: black;");
+#endif
 
         QVBoxLayout * mplayerlayerLayout = new QVBoxLayout( mplayerlayer );
@@ -228 +221 @@
         setSizePolicy( QSizePolicy::Expanding , QSizePolicy::Expanding );
         setFocusPolicy( Qt::StrongFocus );
+        
+//#ifdef HANDLE_GESTURES
+        grabGesture(Qt::TapGesture);
+//#endif
 
         installEventFilter(this);
@@ -265 +262 @@
 #if USE_COLORKEY
 void MplayerWindow::setColorKey( QColor c ) {
+        #ifdef CHANGE_WIDGET_COLOR
         ColorUtils::setBackgroundColor( mplayerlayer, c );
+        #endif
 }
 #endif
@@ -277 +276 @@
 
 void MplayerWindow::setLogoVisible( bool b) {
+        qDebug() << "MplayerWindow::setLogoVisible:" << b;
+
+#if REPAINT_BACKGROUND_OPTION
+        if (b) mplayerlayer->setUpdatesEnabled(true);
+#endif
+
         if (corner_widget) {
                 corner_widget->setVisible(b);
@@ -482 +487 @@
 
 bool MplayerWindow::eventFilter( QObject * object, QEvent * event ) {
-
+#ifdef HANDLE_GESTURES
+        if (event->type() == QEvent::Gesture) {
+                qDebug() << "MplayerWindow::eventFilter: event:" << event;
+                QGestureEvent * ge = static_cast<QGestureEvent*>(event);
+                qDebug() << "MplayerWindow::eventFilter: ge:" << ge;
+                if (QGesture * tap = ge->gesture(Qt::TapGesture)) {
+                        QTapGesture * tg = static_cast<QTapGesture *>(tap);
+                        qDebug() << "MplayerWindow::eventFilter: tg:" << tg;
+                        event->setAccepted(true);
+                        return false;
+                }
+        }
+#endif
+        
     if (!mouse_drag_tracking)
         return false;
@@ -641 +659 @@
                 retranslateStrings();
         } else {
-                QWidget::changeEvent(e);
+                Screen::changeEvent(e);
         }
 }