Qt: Prevent window from being created off-screen

mgba-emu · Oct 17, 2017 · acbd8a3 · acbd8a3
1 parent a691143
commit acbd8a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -28,6 +28,7 @@ Misc:
  - Python: Integrate tests from cinema test suite
  - Util: Don't build crc32 if the function already exists
  - GBA: Implement display start DMAs
+ - Qt: Prevent window from being created off-screen
 
 0.6.1: (2017-10-01)
 Bugfixes:

diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
@@ -550,11 +550,12 @@ void Window::showEvent(QShowEvent* event) {
 	m_wasOpened = true;
 	resizeFrame(m_screenWidget->sizeHint());
 	QVariant windowPos = m_config->getQtOption("windowPos");
-	if (!windowPos.isNull()) {
+	QRect geom = QApplication::desktop()->availableGeometry(this);
+	if (!windowPos.isNull() && geom.contains(windowPos.toPoint())) {
 		move(windowPos.toPoint());
 	} else {
 		QRect rect = frameGeometry();
-		rect.moveCenter(QApplication::desktop()->availableGeometry().center());
+		rect.moveCenter(geom.center());
 		move(rect.topLeft());
 	}
 	if (m_fullscreenOnStart) {