openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-21 04:25:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

!766 bug fix showWhenLocked

Browse Source 
Merge pull request !766 from qianlf/master
This commit is contained in:
openharmony_ci
2022-04-26 14:51:40 +00:00
committed by Gitee
parent 04de45f6cd a1669a1085
commit 449abd1107
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wmserver/src/window_node_container.cpp
+2 -2
View File
@@ -196,8 +196,8 @@ WMError WindowNodeContainer::AddWindowNodeOnWindowTree(sptr<WindowNode>& node, s
node->requestedVisibility_ = true;
if (parentNode != nullptr) { // subwindow
if (parentNode->parent_ != root &&
!((node->GetWindowFlags() & static_cast<uint32_t>(WindowFlag::WINDOW_FLAG_SHOW_WHEN_LOCKED)) &&
(node->parent_ == aboveAppWindowNode_))) {
!((parentNode->GetWindowFlags() & static_cast<uint32_t>(WindowFlag::WINDOW_FLAG_SHOW_WHEN_LOCKED)) &&
(parentNode->parent_ == aboveAppWindowNode_))) {
WLOGFE("window type and parent window not match or try to add subwindow to subwindow, which is forbidden");
return WMError::WM_ERROR_INVALID_PARAM;
}