Merge lp:~sojkam1-fel/stellarium/screen-number into lp:stellarium

[Michal Sojka]

Another attempt - hopefully without conflicts.

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'src/StelMainView.cpp'
--- src/StelMainView.cpp	2015-02-13 16:15:28 +0000
+++ src/StelMainView.cpp	2015-02-15 16:14:23 +0000
@@ -480,12 +480,12 @@
 
 	if (fullscreen)
 	{
+		move(screenGeom.x(), screenGeom.y());
 		// The fullscreen window appears on screen where is the majority of
-		// the normal window. So we first resize (shrink) the normal window
-		// to screen area.
+		// the normal window. Therefore we crop the normal window to the
+		// screen area to ensure that the majority is not on another screen.
+		setGeometry(geometry() & screenGeom);
 		setFullScreen(true);
-		move(screenGeom.x(), screenGeom.y());
-		resize(screenGeom.width(), screenGeom.height());
 	}
 	else
 	{