From 9ad0e2f4e6e354a0a91179cb0aa42bce5c05201c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Tue, 7 Feb 2023 20:09:59 +0400
Subject: [PATCH] Migrate Grow Limit editor feature to a more modern code

---
 apps/opencs/view/doc/view.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 914ca41217..c8332ef8ba 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -2,11 +2,6 @@
 
 #include <QApplication>
 #include <QCloseEvent>
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <QDesktopWidget>
-#endif
-
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QScreen>
@@ -51,6 +46,16 @@
 #include "subviewfactoryimp.hpp"
 #include "viewmanager.hpp"
 
+QRect desktopRect()
+{
+    QRegion virtualGeometry;
+    for (auto screen : QGuiApplication::screens())
+    {
+        virtualGeometry += screen->geometry();
+    }
+    return virtualGeometry.boundingRect();
+}
+
 void CSVDoc::View::closeEvent(QCloseEvent* event)
 {
     if (!mViewManager.closeRequest(this))
@@ -1106,15 +1111,11 @@ void CSVDoc::View::merge()
 
 void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QRect rect;
     if (isGrowLimit)
         rect = QApplication::screenAt(pos())->geometry();
     else
-        rect = QGuiApplication::screens().at(QApplication::desktop()->screenNumber(this))->geometry();
-#else
-    QRect rect = QApplication::screenAt(pos())->geometry();
-#endif
+        rect = desktopRect();
 
     if (!mScrollbarOnly && mScroll && mSubViews.size() > 1)
     {