From 7adfe46cbab2fd4a97a7fb4c035242c1fb6b77fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwwx1139321=E2=80=9D?= Date: Thu, 24 Apr 2025 21:00:35 +0800 Subject: [PATCH] =?UTF-8?q?waring=EF=BC=9AJsEnhancedPanelRect::Read=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=91=BD=E4=BB=A4=E5=AE=9E=E7=8E=B0=E4=B8=8E?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “wwx1139321” --- .../js/napi/inputmethodability/js_panel.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/frameworks/js/napi/inputmethodability/js_panel.cpp b/frameworks/js/napi/inputmethodability/js_panel.cpp index 70acaa949..a0f7348d4 100644 --- a/frameworks/js/napi/inputmethodability/js_panel.cpp +++ b/frameworks/js/napi/inputmethodability/js_panel.cpp @@ -748,24 +748,25 @@ bool JsPanelRect::Read(napi_env env, napi_value object, LayoutParams &layoutPara return ret; } -bool JsEnhancedPanelRect::Read(napi_env env, napi_value object, EnhancedLayoutParams ¶ms) +bool JsEnhancedPanelRect::Read(napi_env env, napi_value object, EnhancedLayoutParams &layoutParams) { napi_status status = napi_generic_failure; napi_value jsObject = nullptr; bool ret = JsUtils::ReadOptionalProperty( - env, object, { napi_boolean, TYPE_BOOLEAN, "fullScreenMode" }, params.isFullScreen); - if (ret && params.isFullScreen) { + env, object, { napi_boolean, TYPE_BOOLEAN, "fullScreenMode" }, layoutParams.isFullScreen); + if (ret && layoutParams.isFullScreen) { IMSA_HILOGD("full screen mode, no need to parse rect"); } else { ret = JsUtils::ReadOptionalProperty( - env, object, { napi_object, TYPE_OBJECT, "landscapeRect" }, params.landscape.rect); + env, object, { napi_object, TYPE_OBJECT, "landscapeRect" }, layoutParams.landscape.rect); ret = ret && JsUtils::ReadOptionalProperty( - env, object, { napi_object, TYPE_OBJECT, "portraitRect" }, params.portrait.rect); + env, object, { napi_object, TYPE_OBJECT, "portraitRect" }, layoutParams.portrait.rect); PARAM_CHECK_RETURN(env, ret, "landscapeRect and portraitRect should not be empty", TYPE_NONE, false); } JsUtils::ReadOptionalProperty( - env, object, { napi_number, TYPE_NUMBER, "landscapeAvoidY" }, params.landscape.avoidY); - JsUtils::ReadOptionalProperty(env, object, { napi_number, TYPE_NUMBER, "portraitAvoidY" }, params.portrait.avoidY); + env, object, { napi_number, TYPE_NUMBER, "landscapeAvoidY" }, layoutParams.landscape.avoidY); + JsUtils::ReadOptionalProperty( + env, object, { napi_number, TYPE_NUMBER, "portraitAvoidY" }, layoutParams.portrait.avoidY); return ret; } -- Gitee