From 2886c7d72c07c05e37b1273820f48bddd26b5988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=AF=E6=AD=8C?= Date: Wed, 10 Jul 2024 17:22:12 +0800 Subject: [PATCH] remove virtual keyqord from View::onFilterTouchEventForSecurity --- src/gui/view/view.cc | 2 +- src/gui/view/view.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/view/view.cc b/src/gui/view/view.cc index 29e35a24..7fd3e323 100755 --- a/src/gui/view/view.cc +++ b/src/gui/view/view.cc @@ -6065,7 +6065,7 @@ int View::commitText(const std::wstring&ws){ } bool View::canReceivePointerEvents()const{ - return (mViewFlags & VISIBILITY_MASK) == VISIBLE || getAnimation() != nullptr; + return ((mViewFlags & VISIBILITY_MASK) == VISIBLE) || (getAnimation() != nullptr); } bool View::getFilterTouchesWhenObscured() const{ diff --git a/src/gui/view/view.h b/src/gui/view/view.h index b47bf444..a85b1077 100755 --- a/src/gui/view/view.h +++ b/src/gui/view/view.h @@ -613,8 +613,8 @@ protected: bool canReceivePointerEvents()const; bool getFilterTouchesWhenObscured()const; View& setFilterTouchesWhenObscured(bool enabled); + bool onFilterTouchEventForSecurity(MotionEvent& event); virtual bool dispatchHoverEvent(MotionEvent&event); - virtual bool onFilterTouchEventForSecurity(MotionEvent& event); virtual bool dispatchTrackballEvent(MotionEvent& event); virtual bool dispatchCapturedPointerEvent(MotionEvent& event); virtual bool dispatchGenericPointerEvent(MotionEvent& event);