From 21ff02a69331fbcd53dc93a1af9a93618225b4bf Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 18 Feb 2015 14:35:00 -0600 Subject: GUI: Support styles in xml to reduce xml file size Also allow sliders to have their own text label instead of requiring a whole separate text object for the label in the xml. Change-Id: I6e314efb4bb454d496555ff7e003d743063a1308 --- gui/fileselector.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gui/fileselector.cpp') diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index 5c287c34d..2602eb257 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -70,8 +70,10 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) : GUIScrollList(node) if (attr) mPathVar = attr->value(); attr = child->first_attribute("default"); - if (attr) + if (attr) { + mPathDefault = attr->value(); DataManager::SetValue(mPathVar, attr->value()); + } } // Handle the result variable @@ -168,6 +170,8 @@ int GUIFileSelector::NotifyVarChange(const std::string& varName, const std::stri } else { // Reset the list to the top SetVisibleListLocation(0); + if (value.empty()) + DataManager::SetValue(mPathVar, mPathDefault); } updateFileList = true; mUpdate = 1; @@ -288,6 +292,10 @@ void GUIFileSelector::SetPageFocus(int inFocus) { GUIScrollList::SetPageFocus(inFocus); if (inFocus) { + std::string value; + DataManager::GetValue(mPathVar, value); + if (value.empty()) + DataManager::SetValue(mPathVar, mPathDefault); updateFileList = true; mUpdate = 1; } -- cgit v1.2.3