[vlc-commits] commit: Qt: Do not try to move when going to fullscreen if you have only 1 screen. ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jun 21 00:13:28 2010 +0200| [d357698c04a5cac917fb5515a7d76e70f770166e] | committer: Jean-Baptiste Kempf 

Qt: Do not try to move when going to fullscreen if you have only 1 screen.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=d357698c04a5cac917fb5515a7d76e70f770166e
---

 modules/gui/qt4/main_interface.cpp |    4 ++++
 modules/gui/qt4/qt4.hpp            |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 9e8a93c..5c36be7 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -614,7 +614,11 @@ void MainInterface::setVideoFullScreen( bool fs )
         QRect screenres = QApplication::desktop()->screenGeometry( numscreen );
 
         /* To be sure window is on proper-screen in xinerama */
+#if HAS_QT46
+        if( !screenres.contains( pos() ) && QApplication::desktop()->screenCount() > 1 )
+#else
         if( !screenres.contains( pos() ) )
+#endif
         {
             msg_Dbg( p_intf, "Moving video to correct screen");
             move( QPoint( screenres.x(), screenres.y() ) );
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 64f5821..47407d5 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -44,6 +44,7 @@
 #endif
 
 #define HAS_QT45 ( QT_VERSION >= 0x040500 )
+#define HAS_QT46 ( QT_VERSION >= 0x040600 )
 
 enum {
     DialogEventType = 0,