From 5a9d1a3fb0e48bd4eb798c14dde510d66d238994 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Thu, 28 Aug 2025 18:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang --- .../base/view_abstract_model_ng.h | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/frameworks/core/components_ng/base/view_abstract_model_ng.h b/frameworks/core/components_ng/base/view_abstract_model_ng.h index 833940a7a16..09f045d4d10 100644 --- a/frameworks/core/components_ng/base/view_abstract_model_ng.h +++ b/frameworks/core/components_ng/base/view_abstract_model_ng.h @@ -1634,6 +1634,23 @@ public: ViewAbstract::NotifyDragStartRequest(dragStatus); } + virtual void CreateWithResourceObj(const RefPtr& frameNode, + const RefPtr& resourceObj, const PopupOptionsType& type) override; + static std::string PopupTypeStr(const PopupType& type); + static void UpdateColor(const RefPtr& frameNode, const PopupType& type, const Color& color); + static void CreateWithColorResourceObj( + const RefPtr& frameNode, const RefPtr& ColorResObj, const PopupType& type); + static void CreateWithBoolResourceObj( + const RefPtr& frameNode, const RefPtr& maskResObj); + static std::string PopupOptionTypeStr(const PopupOptionsType& type); + static void ParseOptionsDimension(const RefPtr& frameNode, + const RefPtr& dimensionResObj, const PopupOptionsType& type, CalcDimension& dimension); + static void CreateWithDimensionResourceObj(const RefPtr& frameNode, + const RefPtr& dimensionResObj, const PopupOptionsType& type); + virtual void CreateWithResourceObj(const RefPtr& frameNode, + const RefPtr& resourceObj, const PopupType& type) override; + virtual void CreateWithResourceObj( + const RefPtr& frameNode, const RefPtr& resourceObj) override; void SetAccessibilityGroup(bool accessible) override; void SetAccessibilityText(const std::string& text) override; void SetAccessibilityTextHint(const std::string& text) override; @@ -1654,27 +1671,10 @@ public: void SetAccessibilityUseSamePage(const std::string& pageMode) override; void SetAccessibilityScrollTriggerable(bool triggerable, bool resetValue) override; void SetAccessibilityFocusDrawLevel(int32_t drawLevel) override; - static std::string PopupTypeStr(const PopupType& type); - static void UpdateColor(const RefPtr& frameNode, const PopupType& type, const Color& color); - static void CreateWithColorResourceObj( - const RefPtr& frameNode, const RefPtr& ColorResObj, const PopupType& type); - static void CreateWithBoolResourceObj( - const RefPtr& frameNode, const RefPtr& maskResObj); - static std::string PopupOptionTypeStr(const PopupOptionsType& type); - static void ParseOptionsDimension(const RefPtr& frameNode, - const RefPtr& dimensionResObj, const PopupOptionsType& type, CalcDimension& dimension); - static void CreateWithDimensionResourceObj(const RefPtr& frameNode, - const RefPtr& dimensionResObj, const PopupOptionsType& type); - virtual void CreateWithResourceObj(const RefPtr& frameNode, - const RefPtr& resourceObj, const PopupType& type) override; - virtual void CreateWithResourceObj( - const RefPtr& frameNode, const RefPtr& resourceObj) override; void RemoveResObj(const std::string& key) override { ViewAbstract::RemoveResObj(key); } - virtual void CreateWithResourceObj(const RefPtr& frameNode, - const RefPtr& resourceObj, const PopupOptionsType& type) override; void SetForegroundColor(const Color& color) override { ViewAbstract::SetForegroundColor(color); -- Gitee