From dacedba6df1113229b321173d6c9b8ae3dcbc7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=B9=E7=90=BC?= <wangdanqiong@huawei.com>
Date: Mon, 1 Sep 2025 21:17:30 +0800
Subject: [PATCH] syncmenuproperty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 王丹琼 <wangdanqiong@huawei.com>
Change-Id: Icbf8cf86eda8fe004e2b85c1ed9942369fa78369
Signed-off-by: 王丹琼 <wangdanqiong@huawei.com>
---
 .../core/components_ng/property/menu_property.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/frameworks/core/components_ng/property/menu_property.h b/frameworks/core/components_ng/property/menu_property.h
index e34b76d3b0d..af084c37ab5 100644
--- a/frameworks/core/components_ng/property/menu_property.h
+++ b/frameworks/core/components_ng/property/menu_property.h
@@ -19,6 +19,7 @@
 #include "base/geometry/dimension.h"
 #include "core/components/common/properties/placement.h"
 #include "core/components_ng/event/gesture_event_hub.h"
+#include "core/components_ng/property/border_property.h"
 #include "core/components_ng/property/transition_property.h"
 
 namespace OHOS::Ace::NG {
@@ -107,6 +108,14 @@ struct MenuParam {
     bool disappearScaleToTarget = false;
     std::optional<NG::BorderWidthProperty> outlineWidth;
     std::optional<NG::BorderColorProperty> outlineColor;
+    std::optional<bool> maskEnable;
+    std::optional<MenuMaskType> maskType;
+    std::optional<OffsetF> anchorPosition;
+    std::optional<ModalMode> modalMode;
+    std::optional<PreviewScaleMode> previewScaleMode;
+    std::optional<AvailableLayoutAreaMode> availableLayoutAreaMode;
+    bool isDarkMode = false;
+    bool isWithTheme = false;
     struct resourceUpdater {
         RefPtr<ResourceObject> resObj;
         std::function<void(const RefPtr<ResourceObject>&, MenuParam&)> updateFunc;
@@ -142,14 +151,6 @@ struct MenuParam {
             resourceUpdater.updateFunc(resourceUpdater.resObj, *this);
         }
     }
-    std::optional<bool> maskEnable;
-    std::optional<MenuMaskType> maskType;
-    std::optional<ModalMode> modalMode;
-    std::optional<PreviewScaleMode> previewScaleMode;
-    std::optional<AvailableLayoutAreaMode> availableLayoutAreaMode;
-    std::optional<OffsetF> anchorPosition;
-    bool isDarkMode = false;
-    bool isWithTheme = false;
 };
 
 } // namespace OHOS::Ace::NG
-- 
Gitee