Revert some changes in VideoDock

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

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/gui/VideoDock.cpp b/src/gui/VideoDock.cpp
@@ -67,6 +67,17 @@ void VideoDock::fullScreen( bool b )
 	}
 	else
 	{
+		/* Visualizations on full screen */
+		if ( widget() != &iDW )
+		{
+			if ( widget() )
+			{
+				widget()->unsetCursor();
+				widget()->setParent( NULL );
+			}
+			setWidget( &iDW );
+		}
+
 		setTitleBarVisible();
 		setFeatures( DockWidget::AllDockWidgetFeatures );
 		setFloating( is_floating );
@@ -117,12 +128,12 @@ void VideoDock::dropEvent( QDropEvent *e )
 }
 void VideoDock::mouseMoveEvent( QMouseEvent *e )
 {
-	if ( iDW.widget() )
+	if ( internalWidget() )
 	{
 #ifndef Q_OS_MAC
 		if ( ++pixels == 25 )
 #endif
-			iDW.widget()->unsetCursor();
+			internalWidget()->unsetCursor();
 		hideCursorTim.start( 750 );
 	}
 	if ( e )
@@ -161,8 +172,8 @@ void VideoDock::wheelEvent( QWheelEvent *e )
 void VideoDock::leaveEvent( QEvent *e )
 {
 	hideCursorTim.stop();
-	if ( iDW.widget() )
-		iDW.widget()->unsetCursor();
+	if ( internalWidget() )
+		internalWidget()->unsetCursor();
 #ifndef Q_OS_MAC
 	pixels = 0;
 #endif
@@ -209,8 +220,8 @@ void VideoDock::popup( const QPoint &p )
 void VideoDock::hideCursor()
 {
 	hideCursorTim.stop();
-	if ( iDW.widget() )
-		iDW.widget()->setCursor( Qt::BlankCursor );
+	if ( internalWidget() )
+		internalWidget()->setCursor( Qt::BlankCursor );
 #ifndef Q_OS_MAC
 	pixels = 0;
 #endif

diff --git a/src/gui/VideoDock.hpp b/src/gui/VideoDock.hpp
@@ -23,6 +23,11 @@ class VideoDock : public DockWidget
 		iDW.update();
 	}
 private:
+	inline QWidget *internalWidget()
+	{
+		return ( widget() == &iDW ) ? iDW.widget() : widget();
+	}
+
 	void dragEnterEvent( QDragEnterEvent * );
 	void dropEvent( QDropEvent * );
 	void mouseMoveEvent( QMouseEvent * );