From d739c714e27e4b9e53904270bf23bea7fe21588d Mon Sep 17 00:00:00 2001 From: tomkl123 Date: Fri, 30 May 2025 18:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E8=B5=8B=E5=88=9D=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tomkl123 Change-Id: I2a684f35bfb2e729cc4489eb458699115e441c31 --- .../core/components_ng/pattern/grid/grid_item_theme.h | 10 +++++----- .../core/components_ng/pattern/grid/grid_layout_info.h | 4 ++-- .../grid/grid_scroll/grid_scroll_layout_algorithm.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/core/components_ng/pattern/grid/grid_item_theme.h b/frameworks/core/components_ng/pattern/grid/grid_item_theme.h index 8834b176110..9ccc4b81a37 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_item_theme.h +++ b/frameworks/core/components_ng/pattern/grid/grid_item_theme.h @@ -114,16 +114,16 @@ protected: GridItemTheme() = default; private: - Color pressColor_; - Color hoverColor_; + Color pressColor_ = Color::WHITE; + Color hoverColor_ = Color::WHITE; int32_t hoverAnimationDuration_ = 250; int32_t hoverToPressAnimationDuration_ = 100; double disabledAlpha_ = 0.4; double enabledAlpha_ = 1.0; - Dimension focusRadius_; + Dimension focusRadius_ = 0.0_vp; Dimension focusPaintPadding_ = 3.0_vp; - Color focusColor_; - Dimension borderRadiusValue_; + Color focusColor_ = Color::WHITE; + Dimension borderRadiusValue_ = 0.0_vp; NG::BorderRadiusProperty borderRadius_; }; } // namespace OHOS::Ace::NG diff --git a/frameworks/core/components_ng/pattern/grid/grid_layout_info.h b/frameworks/core/components_ng/pattern/grid/grid_layout_info.h index e6816f4f962..85b0916d233 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_layout_info.h +++ b/frameworks/core/components_ng/pattern/grid/grid_layout_info.h @@ -416,10 +416,10 @@ struct GridLayoutInfo { bool offsetEnd_ = false; // true if content bottom is truly reached // Grid has GridItem whose columnEnd - columnStart > 0 - bool hasBigItem_; + bool hasBigItem_ = false; // Grid has GridItem whose rowEnd - rowStart > 0 - bool hasMultiLineItem_; + bool hasMultiLineItem_ = false; // false when offset is updated but layout hasn't happened, so data is out of sync bool synced_ = false; diff --git a/frameworks/core/components_ng/pattern/grid/grid_scroll/grid_scroll_layout_algorithm.h b/frameworks/core/components_ng/pattern/grid/grid_scroll/grid_scroll_layout_algorithm.h index 6cf6d4e5e53..cb7c3c0f5f4 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_scroll/grid_scroll_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/grid/grid_scroll/grid_scroll_layout_algorithm.h @@ -274,7 +274,7 @@ private: std::map itemsCrossPosition_; int32_t scrollSource_ = SCROLL_FROM_NONE; OffsetF childFrameOffset_; - GridReloadReason reason_; + GridReloadReason reason_ = GridReloadReason::INIT; ACE_DISALLOW_COPY_AND_MOVE(GridScrollLayoutAlgorithm); }; -- Gitee