openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-11-23 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename to navigation indicator

Browse Source 
Signed-off-by: whqwe <wangh.sjtu@qq.com>
This commit is contained in:
whqwe 2023-11-22 21:28:26 +08:00
parent 997d5e35c8
commit 42adbd5111
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/innerkits/wm/wm_common.h
View File

@ -473,7 +473,7 @@ enum class AvoidAreaType : uint32_t {
TYPE_CUTOUT, // cutout of screen
TYPE_SYSTEM_GESTURE, // area for system gesture
TYPE_KEYBOARD, // area for soft input keyboard
TYPE_AI_NAVIGATION_BAR, // area for AI navigation bar
TYPE_NAVIGATION_INDICATOR, // area for navigation indicator
};
/**

2
interfaces/kits/napi/window_runtime/window_napi/js_window.cpp
View File

@ -2190,7 +2190,7 @@ napi_value JsWindow::OnGetWindowAvoidAreaSync(napi_env env, napi_callback_info i
uint32_t resultValue = 0;
napi_get_value_uint32(env, nativeMode, &resultValue);
avoidAreaType = static_cast<AvoidAreaType>(resultValue);
errCode = ((avoidAreaType > AvoidAreaType::TYPE_AI_NAVIGATION_BAR) ||
errCode = ((avoidAreaType > AvoidAreaType::TYPE_NAVIGATION_INDICATOR) ||
(avoidAreaType < AvoidAreaType::TYPE_SYSTEM)) ?
WmErrorCode::WM_ERROR_INVALID_PARAM : WmErrorCode::WM_OK;
}

4
interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp
View File

@ -111,8 +111,8 @@ napi_value AvoidAreaTypeInit(napi_env env)
static_cast<int32_t>(AvoidAreaType::TYPE_SYSTEM_GESTURE)));
napi_set_named_property(env, objValue, "TYPE_KEYBOARD",
CreateJsValue(env, static_cast<int32_t>(AvoidAreaType::TYPE_KEYBOARD)));
napi_set_named_property(env, objValue, "TYPE_AI_BAR",
CreateJsValue(env, static_cast<int32_t>(AvoidAreaType::TYPE_AI_NAVIGATION_BAR)));
napi_set_named_property(env, objValue, "TYPE_NAVIGATION_INDICATOR",
CreateJsValue(env, static_cast<int32_t>(AvoidAreaType::TYPE_NAVIGATION_INDICATOR)));
return objValue;
}

2
previewer/include/wm_common.h
View File

@ -455,7 +455,7 @@ enum class AvoidAreaType : uint32_t {
TYPE_CUTOUT, // cutout of screen
TYPE_SYSTEM_GESTURE, // area for system gesture
TYPE_KEYBOARD, // area for soft input keyboard
TYPE_AI_NAVIGATION_BAR, // area for AI navigation bar
TYPE_NAVIGATION_INDICATOR, // area for navigation indicator
};
/**

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

@ -763,7 +763,7 @@ AvoidArea SceneSession::GetAvoidAreaByType(AvoidAreaType type)
session->GetCutoutAvoidArea(rect, avoidArea);
return avoidArea;
}
case AvoidAreaType::TYPE_AI_NAVIGATION_BAR: {
case AvoidAreaType::TYPE_NAVIGATION_INDICATOR: {
session->GetAINavigationBarArea(rect, avoidArea);
return avoidArea;
}

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

@ -4958,7 +4958,7 @@ void SceneSessionManager::UpdateNormalSessionAvoidArea(
return;
}
uint32_t start = static_cast<uint32_t>(AvoidAreaType::TYPE_SYSTEM);
uint32_t end = static_cast<uint32_t>(AvoidAreaType::TYPE_AI_NAVIGATION_BAR);
uint32_t end = static_cast<uint32_t>(AvoidAreaType::TYPE_NAVIGATION_INDICATOR);
for (uint32_t avoidType = start; avoidType <= end; avoidType++) {
AvoidArea avoidArea = sceneSession->GetAvoidAreaByType(static_cast<AvoidAreaType>(avoidType));
ret = UpdateSessionAvoidAreaIfNeed(
@ -5020,9 +5020,9 @@ WSError SceneSessionManager::NotifyAINavigationBarShowStatus(bool isVisible, WSR
if (sceneSession == nullptr) {
continue;
}
AvoidArea avoidArea = sceneSession->GetAvoidAreaByType(AvoidAreaType::TYPE_AI_NAVIGATION_BAR);
AvoidArea avoidArea = sceneSession->GetAvoidAreaByType(AvoidAreaType::TYPE_NAVIGATION_INDICATOR);
UpdateSessionAvoidAreaIfNeed(persistentId, sceneSession, avoidArea,
AvoidAreaType::TYPE_AI_NAVIGATION_BAR);
AvoidAreaType::TYPE_NAVIGATION_INDICATOR);
}
}
};