openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2025-03-01 12:16:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

意见修改

Browse Source 
Signed-off-by: 万孝国 <wanxiaoguo@huawei.com>
This commit is contained in:
万孝国 2024-11-04 09:02:41 +00:00 committed by Gitee
parent a9fbe8ba96
commit 54227ea808
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
window_scene/session/host/src/session.cpp
View File

@ -1684,7 +1684,7 @@ sptr<Session> Session::GetParentSession() const
sptr<Session> Session::GetMainSession() const
{
if (SessionHelper::IsMainWindow(GetWindowType())) {
return const_cast<Session *>(this);
return const_cast<Session*>(this);
} else if (parentSession_) {
return parentSession_->GetMainSession();
} else {

8
window_scene/session_manager/src/scene_session_manager.cpp
View File

@ -4140,13 +4140,15 @@ bool SceneSessionManager::IsSessionVisible(const sptr<SceneSession>& session)
if (WindowHelper::IsSubWindow(session->GetWindowType())) {
const auto& mainSession = session->GetMainSession();
if (mainSession == nullptr) {
TLOGE(WmsLogTag::WMS_SUB, "Can not find parent for this sub window, id: %{public}d", session->GetPersistentId());
TLOGE(WmsLogTag::WMS_SUB, "Can not find parent for this sub window, id: %{public}d",
session->GetPersistentId());
return false;
}
const auto& mainState = mainSession->GetSessionState();
const auto mainState = mainSession->GetSessionState();
if (session->IsVisible() || (state == SessionState::STATE_ACTIVE || state == SessionState::STATE_FOREGROUND)) {
if (mainState == SessionState::STATE_INACTIVE || mainState == SessionState::STATE_BACKGROUND) {
TLOGD(WmsLogTag::WMS_SUB, "Parent of this sub window is at background, id: %{public}d", session->GetPersistentId());
TLOGD(WmsLogTag::WMS_SUB, "Parent of this sub window is at background, id: %{public}d",
session->GetPersistentId());
return false;
}
TLOGD(WmsLogTag::WMS_SUB, "Sub window is at foreground, id: %{public}d", session->GetPersistentId());