openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 01:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!48690 Swiper: add CreateIndicatorId function

Browse Source 
Merge pull request !48690 from Hu_zq/CreateIndicatorId
This commit is contained in:
openharmony_ci 2024-11-18 02:15:40 +00:00 committed by Gitee
commit 8699ca7261
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/core/components_ng/pattern/swiper/swiper_pattern.cpp
View File

@ -2090,7 +2090,7 @@ void SwiperPattern::InitIndicator()
if (!IsShowIndicator()) {
return;
}
indicatorNode = FrameNode::GetOrCreateFrameNode(V2::SWIPER_INDICATOR_ETS_TAG, GetIndicatorId(),
indicatorNode = FrameNode::GetOrCreateFrameNode(V2::SWIPER_INDICATOR_ETS_TAG, CreateIndicatorId(),
[]() { return AceType::MakeRefPtr<SwiperIndicatorPattern>(); });
swiperNode->AddChild(indicatorNode);
} else {
@ -2103,7 +2103,7 @@ void SwiperPattern::InitIndicator()
}
if (GetIndicatorType() == SwiperIndicatorType::DIGIT && lastSwiperIndicatorType_ == SwiperIndicatorType::DOT) {
RemoveIndicatorNode();
indicatorNode = FrameNode::GetOrCreateFrameNode(V2::SWIPER_INDICATOR_ETS_TAG, GetIndicatorId(),
indicatorNode = FrameNode::GetOrCreateFrameNode(V2::SWIPER_INDICATOR_ETS_TAG, CreateIndicatorId(),
[]() { return AceType::MakeRefPtr<SwiperIndicatorPattern>(); });
swiperNode->AddChild(indicatorNode);
}

11
frameworks/core/components_ng/pattern/swiper/swiper_pattern.h
View File

@ -310,14 +310,17 @@ public:
return rightButtonId_.has_value();
}
int32_t GetIndicatorId()
int32_t CreateIndicatorId()
{
if (!indicatorId_.has_value()) {
indicatorId_ = ElementRegister::GetInstance()->MakeUniqueId();
}
indicatorId_ = ElementRegister::GetInstance()->MakeUniqueId();
return indicatorId_.value();
}
int32_t GetIndicatorId() const
{
return indicatorId_.has_value() ? indicatorId_.value() : -1;
}
int32_t GetLeftButtonId()
{
if (!leftButtonId_.has_value()) {