From df3fe6f3143999e14bdc8717b5408f9552ff15aa Mon Sep 17 00:00:00 2001 From: emb <> Date: Thu, 1 Jan 2015 16:33:01 -0600 Subject: [PATCH] Moved layout detection to separate method. --- Source/RetroFE.cpp | 22 ++++++++++++++-------- Source/RetroFE.h | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Source/RetroFE.cpp b/Source/RetroFE.cpp index 361694e..e4349ee 100644 --- a/Source/RetroFE.cpp +++ b/Source/RetroFE.cpp @@ -458,14 +458,7 @@ Page *RetroFE::LoadPage(std::string collectionName) } else { - std::string layoutKeyName = "collections." + collectionName + ".layout"; - std::string layoutName = "Default 16x9"; - - if(!Config.GetProperty(layoutKeyName, layoutName)) - { - Config.GetProperty("layout", layoutName); - } - + std::string layoutName = GetLayout(collectionName); if(PageChain.size() > 0) { @@ -490,3 +483,16 @@ Page *RetroFE::LoadPage(std::string collectionName) return page; } + +std::string RetroFE::GetLayout(std::string collectionName) +{ + std::string layoutKeyName = "collections." + collectionName + ".layout"; + std::string layoutName = "Default 16x9"; + + if(!Config.GetProperty(layoutKeyName, layoutName)) + { + Config.GetProperty("layout", layoutName); + } + + return layoutName; +} \ No newline at end of file diff --git a/Source/RetroFE.h b/Source/RetroFE.h index ead5d0d..827f7af 100644 --- a/Source/RetroFE.h +++ b/Source/RetroFE.h @@ -47,7 +47,7 @@ private: Page *LoadPage(std::string collectionName); RETROFE_STATE ProcessUserInput(); void Update(float dt, bool scrollActive); - + std::string GetLayout(std::string collectionName); Configuration &Config; CollectionDatabase &CollectionDB;