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

Updating scrollinglist copy constructor to include the selected sprite list index

Browse Source
This commit is contained in:
Don Honerbrink 2015-02-26 19:30:48 +00:00
parent 97635859d5
commit 510c85f6ad
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,13 +70,13 @@ ScrollingList::ScrollingList(Configuration &c,
{
}
ScrollingList::ScrollingList(const ScrollingList &copy)
ScrollingList::ScrollingList(const ScrollingList &copy)
: Component(copy)
, SpriteList(NULL)
, TweenEnterTime(0)
, Focus(false)
, FirstSpriteIndex(0)
, SelectedSpriteListIndex(0)
, SelectedSpriteListIndex(copy.SelectedSpriteListIndex)
, ScrollStopRequested(true)
, NotifyAllRequested(false)
, CurrentScrollDirection(ScrollDirectionIdle)
@ -100,24 +100,24 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
if(copy.ScrollPoints)
{
ScrollPoints = new std::vector<ViewInfo *>();
for(unsigned int i = 0; i < copy.ScrollPoints->size(); ++i)
{
ViewInfo *v = new ViewInfo(*copy.ScrollPoints->at(i));
ScrollPoints->push_back(v);
}
}
for(unsigned int i = 0; i < copy.ScrollPoints->size(); ++i)
{
ViewInfo *v = new ViewInfo(*copy.ScrollPoints->at(i));
ScrollPoints->push_back(v);
}
}
if(copy.TweenPoints)
{
TweenPoints = new std::vector<AnimationEvents *>();
for(unsigned int i = 0; i < copy.TweenPoints->size(); ++i)
{
AnimationEvents *v = new AnimationEvents(*copy.TweenPoints->at(i));
TweenPoints->push_back(v);
}
}
for(unsigned int i = 0; i < copy.TweenPoints->size(); ++i)
{
AnimationEvents *v = new AnimationEvents(*copy.TweenPoints->at(i));
TweenPoints->push_back(v);
}
}
}
ScrollingList::~ScrollingList()
{
@ -689,11 +689,11 @@ bool ScrollingList::AllocateTexture(ComponentItemBinding *s)
Config.GetMediaPropertyAbsolutePath(GetCollectionName(), ImageType, false, imagePath);
t = imageBuild.CreateImage(imagePath, item->GetName(), ScaleX, ScaleY);
if(!t)
{
Config.GetMediaPropertyAbsolutePath(item->GetName(), ImageType, true, imagePath);
if(!t)
{
Config.GetMediaPropertyAbsolutePath(item->GetName(), ImageType, true, imagePath);
t = imageBuild.CreateImage(imagePath, ImageType, ScaleX, ScaleY);
}
}
if(!t && item->GetTitle() != item->GetFullTitle())
{