From b11b76c3c9933cbf18df0d54097162e69177b630 Mon Sep 17 00:00:00 2001 From: zhanghaibo Date: Sat, 20 Jan 2024 16:53:52 +0800 Subject: [PATCH] optimize animation effect of picker Signed-off-by: zhanghaibo Change-Id: Iaf3d37f101d8a1ae54cf11a7004dbbb90c89cea9 --- .../pattern/picker/datepicker_column_pattern.cpp | 5 +---- .../pattern/text_picker/textpicker_column_pattern.cpp | 5 +---- .../pattern/time_picker/timepicker_column_pattern.cpp | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/frameworks/core/components_ng/pattern/picker/datepicker_column_pattern.cpp b/frameworks/core/components_ng/pattern/picker/datepicker_column_pattern.cpp index 1862f2924f0..bda7b0a5cc7 100644 --- a/frameworks/core/components_ng/pattern/picker/datepicker_column_pattern.cpp +++ b/frameworks/core/components_ng/pattern/picker/datepicker_column_pattern.cpp @@ -57,7 +57,7 @@ constexpr int32_t CLICK_ANIMATION_DURATION = 300; constexpr int32_t MINDDLE_CHILD_INDEX = 2; constexpr char MEASURE_SIZE_STRING[] = "TEST"; constexpr float FONTWEIGHT = 0.5f; -constexpr float FONT_SIZE_PERCENT = 0.9f; +constexpr float FONT_SIZE_PERCENT = 1.0f; constexpr int32_t BUFFER_NODE_NUMBER = 2; constexpr int32_t HOT_ZONE_HEIGHT_CANDIDATE = 2; constexpr int32_t HOT_ZONE_HEIGHT_DISAPPEAR = 4; @@ -633,9 +633,6 @@ void DatePickerColumnPattern::TextPropertiesLinearAnimation( void DatePickerColumnPattern::UpdateTextPropertiesLinear(bool isDown, double scale) { - if (scale > 1) { - return; - } auto host = GetHost(); CHECK_NULL_VOID(host); uint32_t showCount = GetShowCount(); diff --git a/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp b/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp index 556178d8adb..1687c108619 100644 --- a/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp +++ b/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.cpp @@ -39,7 +39,7 @@ const Dimension FONT_SIZE = Dimension(2.0); const Dimension FOCUS_SIZE = Dimension(1.0); const float MOVE_DISTANCE = 5.0f; constexpr float FONTWEIGHT = 0.5f; -constexpr float FONT_SIZE_PERCENT = 0.9f; +constexpr float FONT_SIZE_PERCENT = 1.0f; constexpr int32_t HOVER_ANIMATION_DURATION = 40; constexpr int32_t CLICK_ANIMATION_DURATION = 300; constexpr size_t MIXTURE_CHILD_COUNT = 2; @@ -813,9 +813,6 @@ void TextPickerColumnPattern::TextPropertiesLinearAnimation( void TextPickerColumnPattern::UpdateTextPropertiesLinear(bool isDown, double scale) { - if (scale > 1.0) { - return; - } if (columnkind_ == ICON) { return; } diff --git a/frameworks/core/components_ng/pattern/time_picker/timepicker_column_pattern.cpp b/frameworks/core/components_ng/pattern/time_picker/timepicker_column_pattern.cpp index f00a95afb4e..e216c7e821b 100644 --- a/frameworks/core/components_ng/pattern/time_picker/timepicker_column_pattern.cpp +++ b/frameworks/core/components_ng/pattern/time_picker/timepicker_column_pattern.cpp @@ -49,7 +49,7 @@ constexpr int32_t HOVER_ANIMATION_DURATION = 250; constexpr int32_t PRESS_ANIMATION_DURATION = 100; constexpr int32_t CLICK_ANIMATION_DURATION = 300; constexpr float FONTWEIGHT = 0.5f; -constexpr float FONT_SIZE_PERCENT = 0.9f; +constexpr float FONT_SIZE_PERCENT = 1.0f; constexpr char MEASURE_SIZE_STRING[] = "TEST"; constexpr int32_t HOT_ZONE_HEIGHT_CANDIDATE = 2; constexpr int32_t HOT_ZONE_HEIGHT_DISAPPEAR = 4; @@ -636,9 +636,6 @@ void TimePickerColumnPattern::TextPropertiesLinearAnimation( void TimePickerColumnPattern::UpdateTextPropertiesLinear(bool isDown, double scale) { - if (scale > 1) { - return; - } auto host = GetHost(); CHECK_NULL_VOID(host); uint32_t showCount = GetShowCount(); -- Gitee