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

[win-linux] cascappmanager: fix hasframe feature

Browse Source
This commit is contained in:
SimplestStudio
2024-03-25 13:44:16 +02:00
parent d2a00a05ec
commit ceddd8b423
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,6 +114,29 @@ std::wstring CAscApplicationManagerWrapper::GetExternalSchemeName()
return !scheme.empty() ? scheme.back() != L':' ? scheme + L":" : scheme : L"";
}
void CAscApplicationManagerWrapper::setHasFrameFeature(CCefView *cef, const wstring &param, int sid)
{
if (param.find(L"framesize") != std::wstring::npos) {
if (CCefViewWidgetImpl * _impl = cef->GetWidgetImpl()) {
QJsonParseError err;
const QJsonDocument doc = QJsonDocument::fromJson(QString::fromStdWString(param).toUtf8(), &err);
if ( err.error == QJsonParseError::NoError ) {
const QJsonObject obj = doc.object()["framesize"].toObject();
int _frame_w = obj["width"].toInt(),
_frame_h = obj["height"].toInt();
QCefView * view = static_cast<QCefView *>(_impl);
const QSize s = view->size() / Utils::getScreenDpiRatioByWidget(view);
std::wstring feature = L"{\"hasframe\":";
feature += ( abs(s.width() - _frame_w) > 1 || abs(s.height() - _frame_h) > 1 ) ? L"true}" : L"false}";
if ( m_receivers.find(sid) != m_receivers.end() )
m_receivers[sid]->onWebAppsFeatures(sid, feature);
else m_pMainWindow->onWebAppsFeatures(sid, feature);
}
}
}
}
void CAscApplicationManagerWrapper::OnEvent(CAscCefMenuEvent * event)
{
if ( event->m_nType == ASC_MENU_EVENT_TYPE_CEF_EXECUTE_COMMAND ) {
@ -215,29 +238,7 @@ bool CAscApplicationManagerWrapper::processCommonEvent(NSEditorApi::CAscCefMenuE
m_receivers[sid]->onWebAppsFeatures(sid,L"{\"uitype\":\"fillform\"}");
}
if ( !((pData->get_Param()).find(L"framesize") == std::wstring::npos) ) {
CCefViewWidgetImpl * _impl = ptr->GetWidgetImpl();
if ( _impl ) {
QJsonParseError jerror;
const QJsonDocument jdoc = QJsonDocument::fromJson(QString::fromStdWString(pData->get_Param()).toUtf8(), &jerror);
if( jerror.error == QJsonParseError::NoError ) {
const QJsonObject obj = jdoc.object()["framesize"].toObject();
int _frame_w = obj["width"].toInt(),
_frame_h = obj["height"].toInt();
QCefView * view = static_cast<QCefView *>(_impl);
const QSize s = view->geometry().size() / Utils::getScreenDpiRatioByWidget(view);
if ( abs(s.width() - _frame_w) > 1 || abs(s.height() - _frame_h) > 1 ) {
const std::wstring feature = L"{\"hasframe\":true}";
if ( m_receivers.find(sid) != m_receivers.end() )
m_receivers[sid]->onWebAppsFeatures(sid, feature);
else m_pMainWindow->onWebAppsFeatures(sid, feature);
}
}
}
}
setHasFrameFeature(ptr, pData->get_Param(), sid);
auto * editor = editorWindowFromViewId(event->get_SenderId());
if ( editor && editor->isCustomWindowStyle() ) {
@ -254,6 +255,12 @@ bool CAscApplicationManagerWrapper::processCommonEvent(NSEditorApi::CAscCefMenuE
}
return true;
} else
if ( cmd.compare(L"webapps:features") == 0 ) {
int sid = event->get_SenderId();
if (CCefView * ptr = GetViewById(sid))
setHasFrameFeature(ptr, pData->get_Param(), sid);
return false;
} else
if ( cmd.compare(L"portal:login") == 0 ) {
AscAppManager::sendCommandTo(SEND_TO_ALL_START_PAGE, L"portal:login", pData->get_Param());
if ( m_pMainWindow ) {

1
win-linux/src/cascapplicationmanagerwrapper.h
View File

@ -140,6 +140,7 @@ private:
void sendSettings(const std::wstring& opts);
void applyTheme(const std::wstring&, bool force = false);
void handleDeeplinkActions(const std::vector<std::wstring>& actions);
void setHasFrameFeature(CCefView*, const std::wstring&, int);
CMainWindow * prepareMainWindow(const QRect& r = QRect());
CMainWindow * mainWindowFromViewId(int uid) const;