From 62d54db8a77f93ffdd15fce27f7656243063850c Mon Sep 17 00:00:00 2001 From: bluesky_wang Date: Thu, 8 May 2025 10:01:34 +0000 Subject: [PATCH 1/4] update services/ui/control/event_listener.cpp. Signed-off-by: bluesky_wang --- services/ui/control/event_listener.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/ui/control/event_listener.cpp b/services/ui/control/event_listener.cpp index fe148c9d..540410f8 100644 --- a/services/ui/control/event_listener.cpp +++ b/services/ui/control/event_listener.cpp @@ -80,9 +80,16 @@ void CallBackDecorator::CallbackWithGuard(Callback cb, OHOS::UIView &view) } } +bool LabelOnTouchListener::OnPress(OHOS::UIView &view, [[maybe_unused]] const OHOS::PressEvent &event) +{ + KeyListener::SetButtonPressed(true); + return true; +} + bool LabelOnTouchListener::OnRelease(OHOS::UIView &view, [[maybe_unused]] const OHOS::ReleaseEvent &event) { // wrap cb_ with CallBackDecorator, then call operator()() + KeyListener::SetButtonPressed(false); CallBackDecorator{cb_}(view, cb_.isAsync); return isConsumed_; } -- Gitee From 387ea4608a1d6a750888cf562f8236eee4edfe57 Mon Sep 17 00:00:00 2001 From: bluesky_wang Date: Thu, 8 May 2025 10:03:15 +0000 Subject: [PATCH 2/4] update services/ui/control/event_listener.h. Signed-off-by: bluesky_wang --- services/ui/control/event_listener.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/ui/control/event_listener.h b/services/ui/control/event_listener.h index 1fb01d96..eafb5681 100644 --- a/services/ui/control/event_listener.h +++ b/services/ui/control/event_listener.h @@ -50,6 +50,7 @@ public: LabelOnTouchListener(Callback cb, bool isConsumed) : cb_(cb), isConsumed_(isConsumed) {} ~LabelOnTouchListener() = default; + bool OnPress(OHOS::UIView &view, const OHOS::PressEvent &event) override; bool OnRelease(OHOS::UIView &view, const OHOS::ReleaseEvent &event) override; private: -- Gitee From bd7bf5e4de7e5afa8d76ca3419504654bd9116e8 Mon Sep 17 00:00:00 2001 From: bluesky_wang Date: Thu, 8 May 2025 11:53:52 +0000 Subject: [PATCH 3/4] update services/ui/control/event_listener.cpp. Signed-off-by: bluesky_wang --- services/ui/control/event_listener.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/ui/control/event_listener.cpp b/services/ui/control/event_listener.cpp index 540410f8..a9a92b8d 100644 --- a/services/ui/control/event_listener.cpp +++ b/services/ui/control/event_listener.cpp @@ -86,6 +86,12 @@ bool LabelOnTouchListener::OnPress(OHOS::UIView &view, [[maybe_unused]] const OH return true; } +bool LabelOnTouchListener::OnCancel(OHOS::UIView &view, [[maybe_unused]] const OHOS::CancelEvent &event) +{ + KeyListener::SetButtonPressed(false); + return true; +} + bool LabelOnTouchListener::OnRelease(OHOS::UIView &view, [[maybe_unused]] const OHOS::ReleaseEvent &event) { // wrap cb_ with CallBackDecorator, then call operator()() -- Gitee From b2f10c24707109211f7b749c3593462eabed2b82 Mon Sep 17 00:00:00 2001 From: bluesky_wang Date: Thu, 8 May 2025 11:58:11 +0000 Subject: [PATCH 4/4] update services/ui/control/event_listener.h. Signed-off-by: bluesky_wang --- services/ui/control/event_listener.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/ui/control/event_listener.h b/services/ui/control/event_listener.h index eafb5681..53a6f5ea 100644 --- a/services/ui/control/event_listener.h +++ b/services/ui/control/event_listener.h @@ -51,6 +51,7 @@ public: : cb_(cb), isConsumed_(isConsumed) {} ~LabelOnTouchListener() = default; bool OnPress(OHOS::UIView &view, const OHOS::PressEvent &event) override; + bool OnCancel(OHOS::UIView &view, const OHOS::CancelEvent &event) override; bool OnRelease(OHOS::UIView &view, const OHOS::ReleaseEvent &event) override; private: -- Gitee