Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor ListView, add do Layout

This commit is contained in:
andyque 2014-06-04 10:51:32 +08:00
parent 652c214374
commit c6cb3a56fb
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/ui/UIListView.cpp
View File

@ -437,9 +437,10 @@ void ListView::refreshView()
updateInnerContainerSize(); updateInnerContainerSize();
} }
void ListView::sortAllChildren() void ListView::doLayout()
{ {
ScrollView::sortAllChildren(); Layout::doLayout();
if (_refreshViewDirty) if (_refreshViewDirty)
{ {
refreshView(); refreshView();

3
cocos/ui/UIListView.h
View File

@ -161,7 +161,8 @@ public:
float getItemsMargin()const; float getItemsMargin()const;
virtual void sortAllChildren() override; virtual void doLayout() override;
virtual void addChild(Node * child) override; virtual void addChild(Node * child) override;
virtual void addChild(Node * child, int zOrder) override; virtual void addChild(Node * child, int zOrder) override;
virtual void addChild(Node* child, int zOrder, int tag) override; virtual void addChild(Node* child, int zOrder, int tag) override;

1
cocos/ui/UIScrollView.cpp
View File

@ -1587,7 +1587,6 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
case TouchEventType::CANCELED: case TouchEventType::CANCELED:
case TouchEventType::ENDED: case TouchEventType::ENDED:
handleReleaseLogic(touchPoint);
handleReleaseLogic(touchPoint); handleReleaseLogic(touchPoint);
break; break;
} }