openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-11-23 06:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10590 修复float Window的displayId逻辑

Browse Source 
Merge pull request !10590 from ineoui/fixFloat
This commit is contained in:
openharmony_ci 2024-11-11 07:14:32 +00:00 committed by Gitee
commit f380b1e1e5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wm/src/window_scene_session_impl.cpp
View File

@ -395,7 +395,6 @@ WMError WindowSceneSessionImpl::CreateAndConnectSpecificSession()
WMError WindowSceneSessionImpl::CreateSystemWindow(WindowType type)
{
uint64_t displayId = DISPLAY_ID_INVALID;
if (WindowHelper::IsAppFloatingWindow(type) || WindowHelper::IsPipWindow(type) ||
type == WindowType::WINDOW_TYPE_TOAST) {
property_->SetParentPersistentId(GetFloatingWindowParentId());
@ -404,14 +403,19 @@ WMError WindowSceneSessionImpl::CreateSystemWindow(WindowType type)
auto mainWindow = FindMainWindowWithContext();
property_->SetFloatingWindowAppType(mainWindow != nullptr ? true : false);
if (mainWindow != nullptr) {
displayId = mainWindow->GetDisplayId();
if (property_->GetDisplayId() != DISPLAY_ID_INVALID &&
property_->GetDisplayId() != mainWindow->GetDisplayId()) {
TLOGE(WmsLogTag::WMS_LIFE, "window has parent and display not same");
return WMError::WM_ERROR_INVALID_DISPLAY;
}
property_->SetDisplayId(mainWindow->GetDisplayId());
property_->SetSubWindowLevel(mainWindow->GetProperty()->GetSubWindowLevel() + 1);
}
} else if (type == WindowType::WINDOW_TYPE_DIALOG) {
if (auto mainWindow = FindMainWindowWithContext()) {
property_->SetParentPersistentId(mainWindow->GetPersistentId());
property_->SetSubWindowLevel(mainWindow->GetProperty()->GetSubWindowLevel() + 1);
displayId = mainWindow->GetDisplayId();
property_->SetDisplayId(mainWindow->GetDisplayId());
TLOGI(WmsLogTag::WMS_DIALOG, "The parentId: %{public}d", mainWindow->GetPersistentId());
}
} else if (WindowHelper::IsSystemSubWindow(type)) {
@ -428,20 +432,9 @@ WMError WindowSceneSessionImpl::CreateSystemWindow(WindowType type)
}
// set parent persistentId
property_->SetParentPersistentId(parentSession->GetPersistentId());
displayId = parentSession->GetDisplayId();
property_->SetDisplayId(parentSession->GetDisplayId());
property_->SetSubWindowLevel(parentSession->GetProperty()->GetSubWindowLevel() + 1);
}
if ((WindowHelper::IsAppFloatingWindow(type) || type == WindowType::WINDOW_TYPE_DIALOG) &&
property_->GetDisplayId() != DISPLAY_ID_INVALID && property_->GetDisplayId() != displayId) {
TLOGE(WmsLogTag::WMS_LIFE,
"window displayId is not same with parent, windowName: %{public}s, "
"displayId: %{public}d, parent displayId: %{public}d",
property_->GetWindowName().c_str(), static_cast<int>(property_->GetDisplayId()),
static_cast<int>(displayId));
return WMError::WM_ERROR_INVALID_DISPLAY;
} else if (property_->GetDisplayId() == DISPLAY_ID_INVALID) {
property_->SetDisplayId(displayId);
}
SetDefaultDisplayIdIfNeed();
return WMError::WM_OK;
}