openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-02-17 08:52:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复scale为1时缩放未清除浮起图&&不指定extraInfo无法发起拖拽的问题

Browse Source 
Signed-off-by: b30058220 <baodi1@huawei.com>
Change-Id: I30db9e871d963aaed816b3ea89660b7b6ec727a9
This commit is contained in:
b30058220 2024-10-12 08:37:17 +00:00
parent b887faf615
commit 3407fb7922
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/core/components_ng/event/gesture_event_hub.cpp
View File

@ -491,7 +491,7 @@ bool GestureEventHub::IsPixelMapNeedScale() const
CHECK_NULL_RETURN(frameNode, false);
auto width = pixelMap_->GetWidth();
auto maxWidth = DragDropManager::GetMaxWidthBaseOnGridSystem(frameNode->GetContextRefPtr());
if (!frameNode->GetDragPreviewOption().isScaleEnabled || width == 0 || width < maxWidth) {
if (!frameNode->GetDragPreviewOption().isScaleEnabled || width == 0 || width <= maxWidth) {
return false;
}
return true;

2
interfaces/napi/kits/drag_controller/js_drag_controller.cpp
View File

@ -1145,7 +1145,7 @@ bool ParseExtraInfo(std::shared_ptr<DragControllerAsyncCtx> asyncCtx, std::strin
napi_get_named_property(asyncCtx->env, element, "extraInfo", &extraInfoValue);
napi_valuetype valueType = napi_undefined;
napi_typeof(asyncCtx->env, extraInfoValue, &valueType);
if (valueType != napi_string) {
if (valueType != napi_string && valueType != napi_undefined) {
errMsg = "The type of extraInfo of the first parameter is incorrect.";
return false;
}