From f2840aaf5450abdd1b21c2ab7964db74df07c22a Mon Sep 17 00:00:00 2001 From: zhangkai Date: Tue, 30 May 2023 13:08:23 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=EF=BC=9A=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E9=95=BF=E6=8C=89=E4=B8=8B=E6=96=87=E4=BB=B6item=E6=B5=AE?= =?UTF-8?q?=E8=B5=B7=E5=8A=A8=E7=94=BB=EF=BC=8C=E9=BC=A0=E6=A0=87=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E5=90=8E=E6=B5=AE=E8=B5=B7=E5=8A=A8=E7=94=BB=E7=BC=A9?= =?UTF-8?q?=E5=9B=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangkai --- frameworks/core/components_ng/event/drag_event.cpp | 8 ++++++++ .../gestures/recognizers/gesture_recognizer.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/frameworks/core/components_ng/event/drag_event.cpp b/frameworks/core/components_ng/event/drag_event.cpp index c9e710d9ba9..7b7d68944ad 100644 --- a/frameworks/core/components_ng/event/drag_event.cpp +++ b/frameworks/core/components_ng/event/drag_event.cpp @@ -160,6 +160,14 @@ void DragEventActuator::OnCollectTouchTarget(const OffsetF& coordinateOffset, co HidePixelMap(); HideFilter(); } + } else { + if (actuator->panRecognizer_->getDeviceType() == SourceType::MOUSE ) { + if (!gestureHub->GetTextDraggable()) { + HideEventColumn(); + HidePixelMap(); + HideFilter(); + } + } } #endif // ENABLE_DRAG_FRAMEWORK CHECK_NULL_VOID(actuator->userCallback_); diff --git a/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h b/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h index bc649b0dfed..7bd8920b013 100644 --- a/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h +++ b/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h @@ -186,6 +186,11 @@ public: } virtual bool CheckTouchId(int32_t touchId) = 0; + SourceType getDeviceType() + { + return deviceType_; + } + protected: void Adjudicate(const RefPtr& recognizer, GestureDisposal disposal) { -- Gitee From 3f7295546693f91a24dd76bf22689371638aeda3 Mon Sep 17 00:00:00 2001 From: zhangkai Date: Tue, 30 May 2023 13:15:35 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=EF=BC=9A=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E9=95=BF=E6=8C=89=E4=B8=8B=E6=96=87=E4=BB=B6item=E6=B5=AE?= =?UTF-8?q?=E8=B5=B7=E5=8A=A8=E7=94=BB=EF=BC=8C=E9=BC=A0=E6=A0=87=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E5=90=8E=E6=B5=AE=E8=B5=B7=E5=8A=A8=E7=94=BB=E7=BC=A9?= =?UTF-8?q?=E5=9B=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangkai --- frameworks/core/components_ng/event/drag_event.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/core/components_ng/event/drag_event.cpp b/frameworks/core/components_ng/event/drag_event.cpp index 7b7d68944ad..3633c0195c0 100644 --- a/frameworks/core/components_ng/event/drag_event.cpp +++ b/frameworks/core/components_ng/event/drag_event.cpp @@ -150,9 +150,9 @@ void DragEventActuator::OnCollectTouchTarget(const OffsetF& coordinateOffset, co auto actuator = weak.Upgrade(); CHECK_NULL_VOID(actuator); #ifdef ENABLE_DRAG_FRAMEWORK + auto gestureHub = actuator->gestureEventHub_.Upgrade(); + CHECK_NULL_VOID(gestureHub); if (!GetIsBindOverlayValue(actuator)) { - auto gestureHub = actuator->gestureEventHub_.Upgrade(); - CHECK_NULL_VOID(gestureHub); if (gestureHub->GetTextDraggable()) { HideTextAnimation(); } else { -- Gitee From 35da5c4b2e999eb2e61b44f5af2420068afde1f6 Mon Sep 17 00:00:00 2001 From: zhangkai Date: Tue, 30 May 2023 13:23:26 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=EF=BC=9A=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E9=95=BF=E6=8C=89=E4=B8=8B=E6=96=87=E4=BB=B6item=E6=B5=AE?= =?UTF-8?q?=E8=B5=B7=E5=8A=A8=E7=94=BB=EF=BC=8C=E9=BC=A0=E6=A0=87=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E5=90=8E=E6=B5=AE=E8=B5=B7=E5=8A=A8=E7=94=BB=E7=BC=A9?= =?UTF-8?q?=E5=9B=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangkai --- frameworks/core/components_ng/event/drag_event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/core/components_ng/event/drag_event.cpp b/frameworks/core/components_ng/event/drag_event.cpp index 3633c0195c0..87e71cce737 100644 --- a/frameworks/core/components_ng/event/drag_event.cpp +++ b/frameworks/core/components_ng/event/drag_event.cpp @@ -161,7 +161,7 @@ void DragEventActuator::OnCollectTouchTarget(const OffsetF& coordinateOffset, co HideFilter(); } } else { - if (actuator->panRecognizer_->getDeviceType() == SourceType::MOUSE ) { + if (actuator->panRecognizer_->getDeviceType() == SourceType::MOUSE) { if (!gestureHub->GetTextDraggable()) { HideEventColumn(); HidePixelMap(); -- Gitee