Fixed Qt6 work area offset moving notifications off screen on Windows.

Author: 23rd

Telegram/SourceFiles/platform/linux/main_window_linux.cpp

@@ -566,4 +566,8 @@ QString ScreenDisplayLabel(const QScreen *screen) {
 	return screen->name();
 }
 
+QRect ScreenAvailableGeometry(const QScreen *screen) {
+	return screen ? screen->availableGeometry() : QRect();
+}
+
 } // namespace Platform

Telegram/SourceFiles/platform/linux/main_window_linux.h

@@ -68,4 +68,6 @@ class MainWindow : public Window::MainWindow {
 
 [[nodiscard]] QString ScreenDisplayLabel(const QScreen *screen);
 
+[[nodiscard]] QRect ScreenAvailableGeometry(const QScreen *screen);
+
 } // namespace Platform

Telegram/SourceFiles/platform/mac/main_window_mac.h

@@ -70,4 +70,6 @@ class MainWindow : public Window::MainWindow {
 
 [[nodiscard]] QString ScreenDisplayLabel(const QScreen *screen);
 
+[[nodiscard]] QRect ScreenAvailableGeometry(const QScreen *screen);
+
 } // namespace Platform

Telegram/SourceFiles/platform/mac/main_window_mac.mm

@@ -335,4 +335,8 @@ QString ScreenDisplayLabel(const QScreen *screen) {
 	return screen ? screen->name() : QString();
 }
 
+QRect ScreenAvailableGeometry(const QScreen *screen) {
+	return screen ? screen->availableGeometry() : QRect();
+}
+
 } // namespace

Telegram/SourceFiles/platform/win/main_window_win.cpp

@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
 #include "main/main_session.h"
+#include "base/algorithm.h"
 #include "base/crc32hash.h"
 #include "base/platform/win/base_windows_wrl.h"
 #include "base/platform/base_platform_info.h"
@@ -845,4 +846,19 @@ QString ScreenDisplayLabel(const QScreen *screen) {
 	return name;
 }
 
+QRect ScreenAvailableGeometry(const QScreen *screen) {
+	if (!screen) {
+		return QRect();
+	}
+	auto result = screen->availableGeometry();
+	const auto geometry = screen->geometry();
+	const auto ratio = screen->devicePixelRatio();
+	if (ratio > 0.) {
+		result.moveTopLeft(geometry.topLeft() + QPoint(
+			int(base::SafeRound((result.x() - geometry.x()) / ratio)),
+			int(base::SafeRound((result.y() - geometry.y()) / ratio))));
+	}
+	return result;
+}
+
 } // namespace Platform

Telegram/SourceFiles/platform/win/main_window_win.h

@@ -110,4 +110,6 @@ class MainWindow : public Window::MainWindow {
 
 [[nodiscard]] QString ScreenDisplayLabel(const QScreen *screen);
 
+[[nodiscard]] QRect ScreenAvailableGeometry(const QScreen *screen);
+
 } // namespace Platform

Telegram/SourceFiles/window/main_window.cpp

@@ -73,7 +73,7 @@ using Core::WindowPosition;
 	// When the last monitor is removed Qt keeps delivering resize events
 	// while QGuiApplication has no screens at all, so screen() is nullptr.
 	const auto screen = widget->screen();
-	return screen ? screen->availableGeometry() : QRect();
+	return screen ? Platform::ScreenAvailableGeometry(screen) : QRect();
 }
 
 [[nodiscard]] QPoint ChildSkip() {

Telegram/SourceFiles/window/notifications_manager.cpp

@@ -1713,14 +1713,14 @@ QRect NotificationDisplayRect(Window::Controller *controller) {
 	}
 
 	if (screen) {
-		return screen->availableGeometry();
+		return Platform::ScreenAvailableGeometry(screen);
 	} else if (controller) {
 		return controller->widget()->desktopRect();
 	}
 	// When the last monitor is removed QGuiApplication has no screens at
 	// all, so primaryScreen() is nullptr.
 	const auto primary = QGuiApplication::primaryScreen();
-	return primary ? primary->availableGeometry() : QRect();
+	return primary ? Platform::ScreenAvailableGeometry(primary) : QRect();
 }
 
 } // namespace Notifications