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

!18743 长按桌面任意元素，桌面背景变模糊，此时点击桌面任意元素，都会打开相应元素

Browse Source 
Merge pull request !18743 from huangshaolin/master
This commit is contained in:
openharmony_ci 2023-08-31 15:18:59 +00:00 committed by Gitee
commit abdfc1e6ca
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adapter/ohos/entrance/subwindow/subwindow_ohos.cpp
View File

@ -525,7 +525,7 @@ void SubwindowOhos::HideMenuNG(const RefPtr<NG::FrameNode>& menu, int32_t target
#endif // ENABLE_DRAG_FRAMEWORK
}
void SubwindowOhos::ClearMenuNG()
void SubwindowOhos::ClearMenuNG(bool inWindow)
{
LOGI("SubwindowOhos::ClearMenuNG");
auto aceContainer = Platform::AceContainer::GetContainer(childContainerId_);
@ -538,7 +538,9 @@ void SubwindowOhos::ClearMenuNG()
HideWindow();
context->FlushPipelineImmediately();
#ifdef ENABLE_DRAG_FRAMEWORK
HideEventColumn();
if (inWindow) {
HideEventColumn();
}
HidePixelMap();
HideFilter();
#endif // ENABLE_DRAG_FRAMEWORK

2
adapter/ohos/entrance/subwindow/subwindow_ohos.h
View File

@ -68,7 +68,7 @@ public:
bool CancelPopup(const std::string& id) override;
void CloseMenu() override;
void ClearMenu() override;
void ClearMenuNG() override;
void ClearMenuNG(bool inWindow) override;
RefPtr<NG::FrameNode> ShowDialogNG(const DialogProperties& dialogProps, std::function<void()>&& buildFunc) override;
void HideSubWindowNG() override;
bool GetShown() override

2
adapter/ohos/entrance/ui_content_impl.cpp
View File

@ -265,7 +265,7 @@ public:
taskExecutor->PostTask(
[instanceId = instanceId_] {
SubwindowManager::GetInstance()->ClearMenu();
SubwindowManager::GetInstance()->ClearMenuNG(instanceId);
SubwindowManager::GetInstance()->ClearMenuNG(instanceId, false);
SubwindowManager::GetInstance()->HidePopupNG(-1, instanceId);
},
TaskExecutor::TaskType::UI);

2
frameworks/base/subwindow/subwindow.h
View File

@ -48,7 +48,7 @@ public:
virtual bool CancelPopup(const std::string& id) = 0;
virtual void CloseMenu() = 0;
virtual void ClearMenu() {};
virtual void ClearMenuNG() = 0;
virtual void ClearMenuNG(bool inWindow = true) = 0;
virtual RefPtr<NG::FrameNode> ShowDialogNG(
const DialogProperties& dialogProps, std::function<void()>&& buildFunc) = 0;
virtual void HideSubWindowNG() = 0;

4
frameworks/base/subwindow/subwindow_manager.cpp
View File

@ -212,7 +212,7 @@ void SubwindowManager::HideMenuNG()
}
}
void SubwindowManager::ClearMenuNG(int32_t instanceId)
void SubwindowManager::ClearMenuNG(int32_t instanceId, bool inWindow)
{
RefPtr<Subwindow> subwindow;
if (instanceId != -1) {
@ -222,7 +222,7 @@ void SubwindowManager::ClearMenuNG(int32_t instanceId)
subwindow = GetCurrentWindow();
}
if (subwindow) {
subwindow->ClearMenuNG();
subwindow->ClearMenuNG(inWindow);
}
}

2
frameworks/base/subwindow/subwindow_manager.h
View File

@ -75,7 +75,7 @@ public:
bool CancelPopup(const std::string& id);
void CloseMenu();
void ClearMenu();
void ClearMenuNG(int32_t instanceId = -1);
void ClearMenuNG(int32_t instanceId = -1, bool inWindow = true);
RefPtr<NG::FrameNode> ShowDialogNG(const DialogProperties& dialogProps, std::function<void()>&& buildFunc);
void HideSubWindowNG();

2
frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
View File

@ -1967,7 +1967,7 @@ void OverlayManager::MountPixelMapToWindowScene(const RefPtr<FrameNode>& columnN
void OverlayManager::MountEventToWindowScene(const RefPtr<FrameNode>& columnNode, const RefPtr<UINode>& windowScene)
{
CHECK_NULL_VOID(windowScene);
columnNode->MountToParent(windowScene, 1);
columnNode->MountToParent(windowScene);
columnNode->OnMountToParentDone();
eventColumnNodeWeak_ = columnNode;
hasEvent_ = true;

2
test/mock/base/mock_subwindow.h
View File

@ -39,7 +39,7 @@ public:
MOCK_METHOD1(CancelPopup, bool(const std::string& id));
MOCK_METHOD0(CloseMenu, void());
MOCK_METHOD0(ClearMenu, void());
MOCK_METHOD0(ClearMenuNG, void());
MOCK_METHOD1(ClearMenuNG, void(bool inWindow));
MOCK_METHOD2(
ShowDialogNG, RefPtr<NG::FrameNode>(const DialogProperties& dialogProps, std::function<void()>&& buildFunc));
MOCK_METHOD0(HideSubWindowNG, void());