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

add system window immersive setting support

Browse Source 
Signed-off-by: jincanran <jincanran@huawei.com>
Change-Id: Iac226d9226cae8aa41b3e484cf1c7f71ff3c49ed
This commit is contained in:
jincanran
2022-03-09 11:33:32 +08:00
parent 8c175a6ede
commit b5dd8c53cc
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wmserver/src/window_node_container.cpp
+17 -20
View File
@@ -423,27 +423,24 @@ std::unordered_map<WindowType, SystemBarProperty> WindowNodeContainer::GetExpect
{ WindowType::WINDOW_TYPE_NAVIGATION_BAR, SystemBarProperty() },
};
// default systemBar Type
if (appWindowNode_->children_.empty()) {
WLOGFI("No immersive window on top. Use default systembar Property");
return sysBarPropMap;
}
for (auto iter = appWindowNode_->children_.rbegin(); iter < appWindowNode_->children_.rend(); ++iter) {
auto& sysBarPropMapNode = (*iter)->GetSystemBarProperty();
if (IsFullImmersiveNode(*iter)) {
WLOGFI("Top fullscreen immersive window id: %{public}d. Use full immersice prop", (*iter)->GetWindowId());
for (auto it : sysBarPropMap) {
sysBarPropMap[it.first] = (sysBarPropMapNode.find(it.first))->second;
std::vector<sptr<WindowNode>> rootNodes = { aboveAppWindowNode_, appWindowNode_, belowAppWindowNode_ };
for (auto& node : rootNodes) {
for (auto iter = node->children_.rbegin(); iter < node->children_.rend(); ++iter) {
auto& sysBarPropMapNode = (*iter)->GetSystemBarProperty();
if (IsFullImmersiveNode(*iter)) {
WLOGFI("Top immersive window id: %{public}d. Use full immersive prop", (*iter)->GetWindowId());
for (auto it : sysBarPropMap) {
sysBarPropMap[it.first] = (sysBarPropMapNode.find(it.first))->second;
}
return sysBarPropMap;
} else if (IsSplitImmersiveNode(*iter)) {
WLOGFI("Top split window id: %{public}d. Use split immersive prop", (*iter)->GetWindowId());
for (auto it : sysBarPropMap) {
sysBarPropMap[it.first] = (sysBarPropMapNode.find(it.first))->second;
sysBarPropMap[it.first].enable_ = false;
}
return sysBarPropMap;
}
return sysBarPropMap;
} else if (IsSplitImmersiveNode(*iter)) {
WLOGFI("Top split immersive window id: %{public}d. Use split immersice prop", (*iter)->GetWindowId());
for (auto it : sysBarPropMap) {
sysBarPropMap[it.first] = (sysBarPropMapNode.find(it.first))->second;
sysBarPropMap[it.first].enable_ = false;
}
return sysBarPropMap;
}
}