pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'For bug 62094' (#197) from feature/for-bug-62094 into develop

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/197
This commit is contained in:
Oleg Kozhukharenko
2025-02-18 09:46:22 +00:00
parent 5879c61aba 973939ab1d
commit 5aa5834c4f
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1007,7 +1007,7 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector<wstring>& v
if ( open_in_new_window ) {
bool isMaximized = false;
_app.m_private->editorWindowGeometry(_start_rect, isMaximized, open_opts.wurl);
_app.m_private->editorWindowGeometry(_start_rect, isMaximized, open_opts);
open_opts.panel_size = CWindowBase::expectedContentSize(_start_rect, true);
open_opts.parent_widget = COpenOptions::eWidgetType::window;
if (CEditorWindow * editor_win = CEditorWindow::create(_start_rect, open_opts)) {

19
win-linux/src/cascapplicationmanagerwrapper_private.h
View File

@ -405,9 +405,22 @@ public:
return QRect();
}
auto editorWindowGeometry(QRect &rc, bool &isMaximized, const std::wstring &wurl) -> void
auto editorWindowGeometry(QRect &rc, bool &isMaximized, const COpenOptions& opts) -> void
{
AscEditorType etype = CEditorTools::editorTypeFromFormat(CCefViewEditor::GetFileFormat(wurl));
AscEditorType etype = AscEditorType::etUndefined;
int format = (opts.format == 0) ? CCefViewEditor::GetFileFormat(opts.wurl) : opts.format;
switch (format) {
case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCXF:
case AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM:
case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF:
case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA:
etype = AscEditorType::etPdf;
break;
default:
etype = CEditorTools::editorTypeFromFormat(format);
break;
}
if (!m_appmanager.m_vecEditors.empty()) {
#ifdef _WIN32
if (HWND hWnd = GetTopWindow(GetDesktopWindow())) {
@ -470,7 +483,7 @@ public:
GET_REGISTRY_USER(reg_user);
bool isMaximized = false;
QRect rect = /*isMaximized ? QRect() :*/ windowRectFromViewId(opts.parent_id);
editorWindowGeometry(rect, isMaximized, opts.wurl);
editorWindowGeometry(rect, isMaximized, opts);
opts_ext.panel_size = CWindowBase::expectedContentSize(rect, true);
opts_ext.parent_widget = COpenOptions::eWidgetType::window;
if (CEditorWindow * editor_win = CEditorWindow::create(rect, opts_ext)) {