funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-02-10 00:45:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checkpoint, forward scrolling broken

Browse Source
This commit is contained in:
Don Honerbrink 2015-08-04 16:57:47 -05:00
parent b5e3384893
commit 9330e85f31
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
RetroFE/Source/Graphics/Component/ScrollingList.cpp
View File

@ -75,6 +75,8 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
, horizontalScroll(copy.horizontalScroll) , horizontalScroll(copy.horizontalScroll)
, spriteList_(NULL) , spriteList_(NULL)
, focus_(false) , focus_(false)
, itemIndex_(0)
, componentIndex_(0)
, scrollStopRequested_(true) , scrollStopRequested_(true)
, notifyAllRequested_(false) , notifyAllRequested_(false)
, currentScrollDirection_(ScrollDirectionIdle) , currentScrollDirection_(ScrollDirectionIdle)
@ -237,7 +239,6 @@ void ScrollingList::click(double nextScrollTime)
// get the previous item // get the previous item
itemIndex_ = loopDecrement(itemIndex_, 1, items_->size()); itemIndex_ = loopDecrement(itemIndex_, 1, items_->size());
Item *i = items_->at(itemIndex_); Item *i = items_->at(itemIndex_);
componentIndex_ = loopDecrement(componentIndex_, 1, components_.size()); componentIndex_ = loopDecrement(componentIndex_, 1, components_.size());
deallocateTexture(componentIndex_); deallocateTexture(componentIndex_);
@ -248,6 +249,7 @@ void ScrollingList::click(double nextScrollTime)
itemIndex_ = loopIncrement(itemIndex_, 1, items_->size()); itemIndex_ = loopIncrement(itemIndex_, 1, items_->size());
Item *i = items_->at(itemIndex_); Item *i = items_->at(itemIndex_);
deallocateTexture(componentIndex_); deallocateTexture(componentIndex_);
allocateTexture(componentIndex_, i); allocateTexture(componentIndex_, i);
@ -402,9 +404,9 @@ void ScrollingList::update(float dt)
{ {
if(currentScrollState_ == ScrollStateStopping) if(currentScrollState_ == ScrollStateStopping)
{ {
click(0);
currentScrollState_ = ScrollStateIdle; currentScrollState_ = ScrollStateIdle;
scrollStopped = true; scrollStopped = true;
click(0);
for(unsigned int i = 0; i < tweenPoints_->size(); ++i) for(unsigned int i = 0; i < tweenPoints_->size(); ++i)
{ {
@ -433,11 +435,11 @@ void ScrollingList::update(float dt)
for(unsigned int i = 0; i < scrollPoints_->size(); i++) for(unsigned int i = 0; i < scrollPoints_->size(); i++)
{ {
unsigned int cindex = loopIncrement(componentIndex_, i, components_.size()); unsigned int cindex = loopIncrement(componentIndex_, i, components_.size());
Component *c = components_.at(cindex); Component *c = components_.at(cindex);
if(c && (scrollRequested || scrollChanged)) if(c && (scrollRequested || scrollChanged))
{ {
ViewInfo *currentvi = scrollPoints_->at(i);
unsigned int nextI = 0; unsigned int nextI = 0;
if(currentScrollDirection_ == ScrollDirectionBack) if(currentScrollDirection_ == ScrollDirectionBack)
{ {
@ -448,6 +450,7 @@ void ScrollingList::update(float dt)
nextI = loopDecrement(i, 1, scrollPoints_->size()); nextI = loopDecrement(i, 1, scrollPoints_->size());
} }
ViewInfo *currentvi = scrollPoints_->at(i);
ViewInfo *nextvi = scrollPoints_->at(nextI); ViewInfo *nextvi = scrollPoints_->at(nextI);
resetTweens(c, tweenPoints_->at(i), currentvi, nextvi, scrollPeriod_); resetTweens(c, tweenPoints_->at(i), currentvi, nextvi, scrollPeriod_);
@ -460,7 +463,9 @@ void ScrollingList::update(float dt)
if(scrollStopped || (notifyAllRequested_ && focus_)) if(scrollStopped || (notifyAllRequested_ && focus_))
{ {
Item *item = getPendingItem(); Item *item = NULL;
unsigned index = loopIncrement(itemIndex_, selectedOffsetIndex_, items_->size());
item = items_->at(index);
for(std::vector<MenuNotifierInterface *>::iterator it = notificationComponents_.begin(); for(std::vector<MenuNotifierInterface *>::iterator it = notificationComponents_.begin();
it != notificationComponents_.end(); it != notificationComponents_.end();
@ -651,30 +656,6 @@ void ScrollingList::removeComponentForNotifications(MenuNotifierInterface *c)
} }
} }
Item* ScrollingList::getPendingItem()
{
Item *item = NULL;
if(items_ && items_->size() > 0)
{
unsigned int index = itemIndex_;
if(currentScrollDirection_ == ScrollDirectionBack)
{
index = loopDecrement(index, 1, items_->size());
}
if(currentScrollDirection_ == ScrollDirectionForward)
{
index = loopIncrement(index, 1, items_->size());
}
item = items_->at(index);
}
return item;
}
bool ScrollingList::isIdle() bool ScrollingList::isIdle()
{ {
return (Component::isIdle() && currentScrollState_ == ScrollStateIdle); return (Component::isIdle() && currentScrollState_ == ScrollStateIdle);

1
RetroFE/Source/Graphics/Component/ScrollingList.h
View File

@ -69,7 +69,6 @@ public:
unsigned int getScrollOffsetIndex(); unsigned int getScrollOffsetIndex();
void setScrollOffsetIndex(unsigned int index); void setScrollOffsetIndex(unsigned int index);
void setSelectedIndex(int selectedIndex); void setSelectedIndex(int selectedIndex);
Item *getPendingItem();
void addComponentForNotifications(MenuNotifierInterface *c); void addComponentForNotifications(MenuNotifierInterface *c);
void removeComponentForNotifications(MenuNotifierInterface *c); void removeComponentForNotifications(MenuNotifierInterface *c);
void freeGraphicsMemory(); void freeGraphicsMemory();