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 #include - -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#endif - #include #include #include @@ -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) {