From 822ce8d462a4535571ace959af1c7b00db86900b Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Wed, 29 Jun 2016 14:24:43 +0200 Subject: [PATCH] Added support for reloadableText type="collectionIndexSize". This will print /. --- .../Graphics/Component/ReloadableText.cpp | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ReloadableText.cpp b/RetroFE/Source/Graphics/Component/ReloadableText.cpp index df16c17..ad0e595 100644 --- a/RetroFE/Source/Graphics/Component/ReloadableText.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableText.cpp @@ -188,17 +188,33 @@ void ReloadableText::ReloadTexture() { if (page.getSelectedIndex() == 0) { - ss << singlePrefix_ << page.getSelectedIndex() << pluralPostfix_; + ss << singlePrefix_ << (page.getSelectedIndex()+1) << pluralPostfix_; } else if (page.getSelectedIndex() == 1) { - ss << singlePrefix_ << page.getSelectedIndex() << singlePostfix_; + ss << singlePrefix_ << (page.getSelectedIndex()+1) << singlePostfix_; } else { - ss << pluralPrefix_ << page.getSelectedIndex() << pluralPostfix_; + ss << pluralPrefix_ << (page.getSelectedIndex()+1) << pluralPostfix_; } - } else if (!selectedItem->leaf) // item is not a leaf + } + else if (type_ == "collectionIndexSize") + { + if (page.getSelectedIndex() == 0) + { + ss << singlePrefix_ << (page.getSelectedIndex()+1) << "/" << page.getCollectionSize() << pluralPostfix_; + } + else if (page.getSelectedIndex() == 1) + { + ss << singlePrefix_ << (page.getSelectedIndex()+1) << "/" << page.getCollectionSize() << singlePostfix_; + } + else + { + ss << pluralPrefix_ << (page.getSelectedIndex()+1) << "/" << page.getCollectionSize() << pluralPostfix_; + } + } + else if (!selectedItem->leaf) // item is not a leaf { (void)config_.getProperty("collections." + selectedItem->name + "." + type_, text ); }