Fixed window position restoring outside the work area on a screen with a different scale

Author: davtur19

Telegram/SourceFiles/window/main_window.cpp

@@ -831,14 +831,32 @@ void MainWindow::firstShow() {
 		show();
 		return;
 	}
-	const auto geometry = countInitialGeometry(initialPosition());
+	const auto position = initialPosition();
+	const auto geometry = countInitialGeometry(position);
 	DEBUG_LOG(("Window Pos: Setting first %1, %2, %3, %4"
 		).arg(geometry.x()
 		).arg(geometry.y()
 		).arg(geometry.width()
 		).arg(geometry.height()));
 	setGeometry(geometry);
 	show();
+
+	InvokeQueued(this, [=] {
+		const auto counted = countInitialGeometry(position);
+		if (counted != geometry) {
+			DEBUG_LOG(("Window Pos: Correcting first %1, %2, %3, %4 "
+				"to %5, %6, %7, %8"
+				).arg(geometry.x()
+				).arg(geometry.y()
+				).arg(geometry.width()
+				).arg(geometry.height()
+				).arg(counted.x()
+				).arg(counted.y()
+				).arg(counted.width()
+				).arg(counted.height()));
+			setGeometry(counted);
+		}
+	});
 }
 
 void MainWindow::positionUpdated() {