pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1157 from ONLYOFFICE/patch/hotfix/v8.0.1_r3

Browse Source 
Fix bug 66480
This commit is contained in:
Maxim Kadushkin
2024-02-13 22:20:55 +03:00
committed by GitHub
parent 6ff4e3d557 e38b6a8c06
commit 54dfb21877
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
win-linux/src/cascapplicationmanagerwrapper.cpp
View File

@ -1269,25 +1269,21 @@ CPresenterWindow * CAscApplicationManagerWrapper::createReporterWindow(void * da
pView->CreateReporter(this, pCreateData);
QString _doc_name;
QRect _currentRect;
QWindow *wnd = nullptr;
if ( m_pMainWindow && m_pMainWindow->holdView(parentid) ) {
_doc_name = m_pMainWindow->documentName(parentid);
_currentRect = m_pMainWindow->windowRect();
wnd = m_pMainWindow->windowHandle();
} else {
CEditorWindow * _window = editorWindowFromViewId(parentid);
if ( _window ) {
_doc_name = _window->documentName();
_currentRect = _window->geometry();
wnd = _window->windowHandle();
}
}
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
int _scrNum = QApplication::desktop()->screenNumber(_currentRect.topLeft());
QRect _scr_rect = QApplication::desktop()->availableGeometry(_scrNum);
#else
QRect _scr_rect = QApplication::screenAt(_currentRect.topLeft())->availableGeometry();
#endif
QScreen *scr = (wnd && wnd->screen()) ? wnd->screen() : QApplication::primaryScreen();
QRect _scr_rect = scr->availableGeometry();
int _scr_dpi_ratio = Utils::getScreenDpiRatio(_scr_rect.topLeft());
GET_REGISTRY_USER(reg_user)