openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-10-07 08:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix system window

Browse Source 
Signed-off-by: qpzeng <zengqingpeng6@huawei.com>
Change-Id: Id8b907fdd76b4d9e90e59292ef3a5c7c470e0c26
This commit is contained in:
qpzeng 2023-08-25 20:00:43 +08:00
parent 36730241c9
commit 7fb3946680
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frameworks/core/components_ng/pattern/window_scene/scene/window_pattern.cpp
View File

@ -102,7 +102,7 @@ bool WindowPattern::IsMainWindow() const
return session_->GetWindowType() == Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW;
}
void WindowPattern::InitContent()
void WindowPattern::OnAttachToFrameNode()
{
contentNode_ = FrameNode::CreateFrameNode(
V2::WINDOW_SCENE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<Pattern>());
@ -206,15 +206,6 @@ void WindowPattern::CreateSnapshotNode(std::optional<std::shared_ptr<Media::Pixe
snapshotNode_->MarkModifyDone();
}
void WindowPattern::OnAttachToFrameNode()
{
InitContent();
auto host = GetHost();
CHECK_NULL_VOID(host);
host->MarkDirtyNode(PROPERTY_UPDATE_MEASURE);
}
void WindowPattern::DispatchPointerEvent(const std::shared_ptr<MMI::PointerEvent>& pointerEvent)
{
CHECK_NULL_VOID(session_);

1
frameworks/core/components_ng/pattern/window_scene/scene/window_pattern.h
View File

@ -50,7 +50,6 @@ protected:
void RegisterLifecycleListener();
void UnregisterLifecycleListener();
void InitContent();
void CreateStartingNode();
void CreateSnapshotNode(std::optional<std::shared_ptr<Media::PixelMap>> snapshot = std::nullopt);

6
frameworks/core/components_ng/pattern/window_scene/scene/window_scene.cpp
View File

@ -84,7 +84,7 @@ void WindowScene::OnAttachToFrameNode()
auto surfaceNode = session_->GetLeashWinSurfaceNode();
CHECK_NULL_VOID(surfaceNode);
auto context = AceType::DynamicCast<NG::RosenRenderContext>(host->GetRenderContext());
CHECK_NULL_VOID(context);
context->SetRSNode(surfaceNode);
@ -97,9 +97,7 @@ void WindowScene::UpdateSession(const sptr<Rosen::Session>& session)
{
CHECK_NULL_VOID(session_);
CHECK_NULL_VOID(session);
if (session_->GetPersistentId() == session->GetPersistentId()) {
return;
}
CHECK_NULL_VOID(session_ != session);
LOGI("session %{public}d changes to %{public}d", session_->GetPersistentId(), session->GetPersistentId());
session_ = session;

2
test/mock/core/pattern/window_scene/mock_window_pattern.cpp
View File

@ -20,8 +20,6 @@ void WindowPattern::RegisterLifecycleListener() {}
void WindowPattern::UnregisterLifecycleListener() {}
void WindowPattern::InitContent() {}
void WindowPattern::CreateStartingNode() {}
void WindowPattern::CreateSnapshotNode(std::optional<std::shared_ptr<Media::PixelMap>> snapshot) {}