diff --git a/frameworks/components/ui_list.cpp b/frameworks/components/ui_list.cpp index cac846540153bf9eefb86bfd34861fa50f1dfb81..9cf4290918fb0cca9f820e0796f1166948599cdf 100755 --- a/frameworks/components/ui_list.cpp +++ b/frameworks/components/ui_list.cpp @@ -36,7 +36,7 @@ UIList::Recycle::~Recycle() scrapView_.Clear(); } -void UIList::Recycle::MesureAdapterRelativeRect() +void UIList::Recycle::MeasureAdapterRelativeRect() { uint16_t i = 0; if (listView_ == nullptr) { @@ -79,7 +79,7 @@ void UIList::Recycle::InitRecycle() listView_->Invalidate(); hasInitialiszed_ = true; if (listView_->xScrollBarVisible_ || listView_->yScrollBarVisible_) { - MesureAdapterRelativeRect(); + MeasureAdapterRelativeRect(); } } @@ -137,14 +137,14 @@ void UIList::Recycle::FillActiveView() } } -Rect UIList::Recycle::GetAdapterItemsReletiveRect() +Rect32 UIList::Recycle::GetAdapterItemsReletiveRect() { return adapterRelativeRect_; } void UIList::Recycle::MoveAdapterItemsRelativeRect(int16_t x, int16_t y) { - Rect& rect = adapterRelativeRect_; + auto& rect = adapterRelativeRect_; rect.SetPosition(rect.GetX() + x, rect.GetY() + y); } @@ -359,7 +359,7 @@ bool UIList::MoveOffset(int16_t x, int16_t y) void UIList::UpdateScrollBar() { - Rect allItemsRect = recycle_.GetAdapterItemsReletiveRect(); + auto allItemsRect = recycle_.GetAdapterItemsReletiveRect(); int16_t totalHeight = allItemsRect.GetHeight() + 2 * scrollBlankSize_; // 2: two blank spaces on both sides int16_t height = GetHeight(); yScrollBar_->SetForegroundProportion(static_cast(height) / totalHeight); @@ -779,7 +779,7 @@ void UIList::SetXScrollBarVisible(bool visible) UIAbstractScroll::SetXScrollBarVisible(visible); if (!lastVisible && xScrollBarVisible_) { if (recycle_.HasInitialiszed()) { - recycle_.MesureAdapterRelativeRect(); + recycle_.MeasureAdapterRelativeRect(); } else { recycle_.InitRecycle(); } @@ -792,7 +792,7 @@ void UIList::SetYScrollBarVisible(bool visible) UIAbstractScroll::SetYScrollBarVisible(visible); if (!lastVisible && yScrollBarVisible_) { if (recycle_.HasInitialiszed()) { - recycle_.MesureAdapterRelativeRect(); + recycle_.MeasureAdapterRelativeRect(); } else { recycle_.InitRecycle(); } diff --git a/interfaces/kits/components/ui_list.h b/interfaces/kits/components/ui_list.h index 8ed8e34fd7ec8f94075b9973dbb4abe9524c8d44..d59c58c677f8ba3707d2f61b5301368bb59d10df 100755 --- a/interfaces/kits/components/ui_list.h +++ b/interfaces/kits/components/ui_list.h @@ -436,9 +436,9 @@ private: scrapView_.Clear(); } - Rect GetAdapterItemsReletiveRect(); + Rect32 GetAdapterItemsReletiveRect(); void MoveAdapterItemsRelativeRect(int16_t x, int16_t y); - void MesureAdapterRelativeRect(); + void MeasureAdapterRelativeRect(); private: friend class UIList; @@ -447,7 +447,7 @@ private: List scrapView_; AbstractAdapter* adapter_; UIList* listView_; - Rect adapterRelativeRect_; + Rect32 adapterRelativeRect_; bool hasInitialiszed_; };