Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into unstable

Browse source
This commit is contained in:
Aloshi 2013-06-26 20:33:18 -05:00
parent 90af5d47ab 6f9ea15696
commit 441e0f660c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/GuiGameList.cpp
View file

@ -19,6 +19,8 @@ GuiGameList::GuiGameList(Window* window, bool useDetail) : GuiComponent(window),
mTheme = new ThemeComponent(mWindow, mDetailed); mTheme = new ThemeComponent(mWindow, mDetailed);
mScreenshot = new ImageComponent(mWindow, getImagePos().x, getImagePos().y, "", (unsigned int)mTheme->getFloat("gameImageWidth"), (unsigned int)mTheme->getFloat("gameImageHeight"), false);
//The GuiGameList can use the older, simple game list if so desired. //The GuiGameList can use the older, simple game list if so desired.
//The old view only shows a list in the center of the screen; the new view can display an image and description. //The old view only shows a list in the center of the screen; the new view can display an image and description.
//Those with smaller displays may prefer the older view. //Those with smaller displays may prefer the older view.
@ -26,17 +28,14 @@ GuiGameList::GuiGameList(Window* window, bool useDetail) : GuiComponent(window),
{ {
mList = new TextListComponent<FileData*>(mWindow, (int)(Renderer::getScreenWidth() * mTheme->getFloat("listOffsetX")), Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::getDefaultFont(Renderer::MEDIUM)); mList = new TextListComponent<FileData*>(mWindow, (int)(Renderer::getScreenWidth() * mTheme->getFloat("listOffsetX")), Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::getDefaultFont(Renderer::MEDIUM));
mScreenshot = new ImageComponent(mWindow, getImagePos().x, getImagePos().y, "", (unsigned int)mTheme->getFloat("gameImageWidth"), (unsigned int)mTheme->getFloat("gameImageHeight"), false);
mScreenshot->setOrigin(mTheme->getFloat("gameImageOriginX"), mTheme->getFloat("gameImageOriginY"));
mImageAnimation = new AnimationComponent(); mImageAnimation = new AnimationComponent();
mImageAnimation->addChild(mScreenshot); mImageAnimation->addChild(mScreenshot);
}else{ }else{
mList = new TextListComponent<FileData*>(mWindow, 0, Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::getDefaultFont(Renderer::MEDIUM)); mList = new TextListComponent<FileData*>(mWindow, 0, Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::getDefaultFont(Renderer::MEDIUM));
mScreenshot = NULL;
mImageAnimation = NULL;
} }
mScreenshot->setOrigin(mTheme->getFloat("gameImageOriginX"), mTheme->getFloat("gameImageOriginY"));
mDescription.setOffset(Vector2i((int)(Renderer::getScreenWidth() * 0.03), mScreenshot->getOffset().y + mScreenshot->getSize().y + 12)); mDescription.setOffset(Vector2i((int)(Renderer::getScreenWidth() * 0.03), mScreenshot->getOffset().y + mScreenshot->getSize().y + 12));
mDescription.setExtent(Vector2u((int)(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03)), 0)); mDescription.setExtent(Vector2u((int)(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03)), 0));
@ -58,11 +57,11 @@ GuiGameList::~GuiGameList()
//undo the parenting hack because otherwise it's not really a child and will try to remove itself on delete //undo the parenting hack because otherwise it's not really a child and will try to remove itself on delete
mList->setParent(NULL); mList->setParent(NULL);
delete mList; delete mList;
delete mScreenshot;
if(mDetailed) if(mDetailed)
{ {
delete mImageAnimation; delete mImageAnimation;
delete mScreenshot;
} }
delete mTheme; delete mTheme;