openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-04-05 00:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Container: toast needn't use subwindow

Browse Source 
Signed-off-by: huzeqi <huzeqi@huawei.com>
Change-Id: I2d99b7a2be814fe8f037d4c8eac7eeb967765911
This commit is contained in:
huzeqi 2023-01-02 16:47:40 +08:00
parent 4fa17080b5
commit b4dd31abeb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
interfaces/napi/kits/prompt/js_prompt.cpp
View File

@ -22,6 +22,7 @@
#include "napi/native_node_api.h" #include "napi/native_node_api.h"
#include "base/subwindow/subwindow_manager.h" #include "base/subwindow/subwindow_manager.h"
#include "base/utils/system_properties.h"
#include "bridge/common/utils/engine_helper.h" #include "bridge/common/utils/engine_helper.h"
#include "bridge/js_frontend/engine/common/js_engine.h" #include "bridge/js_frontend/engine/common/js_engine.h"
@ -150,7 +151,7 @@ static napi_value JSPromptShowToast(napi_env env, napi_callback_info info)
} }
} }
#ifdef OHOS_STANDARD_SYSTEM #ifdef OHOS_STANDARD_SYSTEM
if (Container::IsCurrentUseNewPipeline()) { if (SystemProperties::GetExtSurfaceEnabled() || Container::IsCurrentUseNewPipeline()) {
auto delegate = EngineHelper::GetCurrentDelegate(); auto delegate = EngineHelper::GetCurrentDelegate();
if (!delegate) { if (!delegate) {
LOGE("can not get delegate."); LOGE("can not get delegate.");
@ -391,7 +392,7 @@ static napi_value JSPromptShowDialog(napi_env env, napi_callback_info info)
#ifdef OHOS_STANDARD_SYSTEM #ifdef OHOS_STANDARD_SYSTEM
// NG // NG
if (Container::IsCurrentUseNewPipeline()) { if (SystemProperties::GetExtSurfaceEnabled() || Container::IsCurrentUseNewPipeline()) {
auto delegate = EngineHelper::GetCurrentDelegate(); auto delegate = EngineHelper::GetCurrentDelegate();
if (delegate) { if (delegate) {
delegate->ShowDialog(asyncContext->titleString, asyncContext->messageString, asyncContext->buttons, delegate->ShowDialog(asyncContext->titleString, asyncContext->messageString, asyncContext->buttons,
@ -687,7 +688,7 @@ static napi_value JSPromptShowActionMenu(napi_env env, napi_callback_info info)
}; };
#ifdef OHOS_STANDARD_SYSTEM #ifdef OHOS_STANDARD_SYSTEM
if (Container::IsCurrentUseNewPipeline()) { if (SystemProperties::GetExtSurfaceEnabled() || Container::IsCurrentUseNewPipeline()) {
auto delegate = EngineHelper::GetCurrentDelegate(); auto delegate = EngineHelper::GetCurrentDelegate();
if (delegate) { if (delegate) {
delegate->ShowActionMenu(asyncContext->titleString, asyncContext->buttons, std::move(callBack)); delegate->ShowActionMenu(asyncContext->titleString, asyncContext->buttons, std::move(callBack));