Larger resize bar for touch screens

zaps166 · Jun 5, 2015 · a0ee978 · a0ee978
1 parent 9b7db11
commit a0ee978
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,5 @@
-Zmiany w QMPlay2 build 15.06.05:
+Zmiany w QMPlay2 build 15.06.06:
+	- większy pasek zmiany rozmiatu okien dla ekranów dotykowych,
 	- zoom na ekranie dotykowym (pinch gesture),
 	- poprawiony odczyt okładek płyt z katalogu,
 	- kompatybilność z FFMpeg 2.0 oraz 2.1,

diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp
@@ -44,6 +44,24 @@ using Functions::timeToStr;
 
 #include <math.h>
 
+/* Qt5 or Qt4 in Windows */
+#define UseMainWidgetTmpStyle (QT_VERSION >= 0x050000 || defined Q_OS_WIN)
+
+#if UseMainWidgetTmpStyle
+/* MainWidgetTmpStyle -  dock widget separator extent must be larger for touch screens */
+class MainWidgetTmpStyle : public QCommonStyle
+{
+public:
+	int pixelMetric( PixelMetric metric, const QStyleOption *option, const QWidget *widget ) const
+	{
+		const int pM = QCommonStyle::pixelMetric( metric, option, widget );
+		if ( metric == QStyle::PM_DockWidgetSeparatorExtent )
+			return pM * 5 / 2;
+		return pM;
+	}
+};
+#endif
+
 /* MainWidget */
 MainWidget::MainWidget( QPair< QStringList, QStringList > &QMPArguments )
 #ifdef UPDATER
@@ -52,6 +70,26 @@ MainWidget::MainWidget( QPair< QStringList, QStringList > &QMPArguments )
 {
 	QMPlay2GUI.mainW = this;
 
+#if UseMainWidgetTmpStyle
+	#if QT_VERSION >= 0x050000
+		bool createTmpStyle = false;
+		/* Looking for touch screen */
+		foreach ( const QTouchDevice *touchDev, QTouchDevice::devices() )
+		{
+			/* Touchscreen found */
+			if ( touchDev->type() == QTouchDevice::TouchScreen )
+			{
+				createTmpStyle = true;
+				break;
+			}
+		}
+		if ( createTmpStyle )
+	#elif defined Q_OS_WIN
+		if ( QSysInfo::windowsVersion() > QSysInfo::WV_6_1 ) //Qt4 can't detect touchscreen, so MainWidgetTmpStyle will be used only with Windows >= 8.0
+	#endif
+			setStyle( QScopedPointer< MainWidgetTmpStyle >( new MainWidgetTmpStyle ).data() ); //Is it always OK?
+#endif
+
 	setObjectName( "MainWidget" );
 
 	settingsW = NULL;
@@ -1024,8 +1062,8 @@ void MainWidget::mouseMoveEvent( QMouseEvent *e )
 {
 	if ( fullScreen )
 	{
-		int trigger1 = qMax( 3,  ( int )ceil( 0.002 * width() ) );
-		int trigger2 = qMax( 15, ( int )ceil( 0.015 * width() ) );
+		int trigger1 = qMax< int >( 3,  ceil( 0.002 * width() ) );
+		int trigger2 = qMax< int >( 15, ceil( 0.025 * width() ) );
 
 		int mPosX = 0;
 		if ( videoDock->x() >= 0 )

diff --git a/src/qmplay2/headers/QMPlay2Core.hpp b/src/qmplay2/headers/QMPlay2Core.hpp
@@ -1,7 +1,7 @@
 #ifndef QMPLAY2CORE_HPP
 #define QMPLAY2CORE_HPP
 
-#define QMPlay2Version "15.06.05"
+#define QMPlay2Version "15.06.06"
 
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || (__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
 	#define QMPLAY2_CPU_X86