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 #528 from ONLYOFFICE/fix/focus_on_open_49255

Browse Source 
Fixed a bug 49255: restoring the window state when opening files
This commit is contained in:
maxkadushkin
2022-07-22 11:45:28 +03:00
committed by GitHub
parent adb12a04bf 17fa0abc34
commit e5330d792e
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,6 +895,10 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector<wstring>& v
}
_app.mainWindow()->attachEditor(panel);
if (_app.mainWindow()->isMinimized()) {
_app.mainWindow()->windowState() == (Qt::WindowMinimized | Qt::WindowMaximized) ?
_app.mainWindow()->showMaximized() : _app.mainWindow()->showNormal();
}
}
}
}

9
win-linux/src/windows/platform_linux/cwindowplatform.cpp
View File

@ -119,15 +119,6 @@ bool CWindowPlatform::event(QEvent * event)
static bool _flg_left_button = false;
if (event->type() == QEvent::WindowStateChange) {
CX11Decoration::setMaximized(isMaximized() ? true : false);
/*if(windowState().testFlag(Qt::WindowMaximized)) {
applyWindowState(Qt::WindowMaximized);
} else
if (windowState().testFlag(Qt::WindowNoState)) {
applyWindowState(Qt::WindowNoState);
} else
if (windowState().testFlag(Qt::WindowMinimized)) {
applyWindowState(Qt::WindowMinimized);
}*/
applyWindowState();
adjustGeometry();
} else