Imported Upstream version 16.6.0~ds0

1 files changed, 39 insertions, 7 deletions

diff --git a/src/mplayerwindow.cpp b/src/mplayerwindow.cpp
index 4debb13..7781a62 100644
--- a/src/mplayerwindow.cpp
+++ b/src/mplayerwindow.cpp
@@ -40,6 +40,13 @@
 #include <QPropertyAnimation>
 #endif
 
+//#define HANDLE_GESTURES
+
+#ifdef HANDLE_GESTURES
+#include <QGestureEvent>
+#include <QTapGesture>
+#endif
+
 Screen::Screen(QWidget* parent, Qt::WindowFlags f)
 	: QWidget(parent, f )
 	, check_mouse_timer(0)
@@ -210,23 +217,33 @@ MplayerWindow::MplayerWindow(QWidget* parent, Qt::WindowFlags f)
     , start_drag(QPoint(0,0))
     , mouse_drag_tracking(false)
 {
-	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->setObjectName("mplayerwindowlogo");
+
+	// Set colors
+#ifdef CHANGE_WIDGET_COLOR
+	setAutoFillBackground(true);
+	ColorUtils::setBackgroundColor( this, QColor(0,0,0) );
+	mplayerlayer->setAutoFillBackground(true);
 	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 );
 	mplayerlayerLayout->addWidget( logo, 0, Qt::AlignHCenter | Qt::AlignVCenter );
 
 	setSizePolicy( QSizePolicy::Expanding , QSizePolicy::Expanding );
 	setFocusPolicy( Qt::StrongFocus );
+	
+//#ifdef HANDLE_GESTURES
+	grabGesture(Qt::TapGesture);
+//#endif
 
 	installEventFilter(this);
 	mplayerlayer->installEventFilter(this);
@@ -264,7 +281,9 @@ void MplayerWindow::setCornerWidget(QWidget * w) {
 
 #if USE_COLORKEY
 void MplayerWindow::setColorKey( QColor c ) {
+	#ifdef CHANGE_WIDGET_COLOR
 	ColorUtils::setBackgroundColor( mplayerlayer, c );
+	#endif
 }
 #endif
 
@@ -481,7 +500,20 @@ void MplayerWindow::wheelEvent( QWheelEvent * e ) {
 }
 
 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;
 
@@ -640,7 +672,7 @@ void MplayerWindow::changeEvent(QEvent *e) {
 	if (e->type() == QEvent::LanguageChange) {
 		retranslateStrings();
 	} else {
-		QWidget::changeEvent(e);
+		Screen::changeEvent(e);
 	}
 }