gui: fix condition handling for lists
Base class must be called first, otherwise the condition can never again become true. Fixes font size switching in Material theme. Change-Id: I160a733549495e1bde3cead56b0a3582f0dc744c
This commit is contained in:
@@ -171,11 +171,11 @@ int GUIFileSelector::Update(void)
|
||||
|
||||
int GUIFileSelector::NotifyVarChange(const std::string& varName, const std::string& value)
|
||||
{
|
||||
GUIScrollList::NotifyVarChange(varName, value);
|
||||
|
||||
if(!isConditionTrue())
|
||||
return 0;
|
||||
|
||||
GUIScrollList::NotifyVarChange(varName, value);
|
||||
|
||||
if (varName.empty()) {
|
||||
// Always clear the data variable so we know to use it
|
||||
DataManager::SetValue(mVariable, "");
|
||||
|
||||
+2
-2
@@ -122,11 +122,11 @@ int GUIListBox::Update(void)
|
||||
|
||||
int GUIListBox::NotifyVarChange(const std::string& varName, const std::string& value)
|
||||
{
|
||||
GUIScrollList::NotifyVarChange(varName, value);
|
||||
|
||||
if(!isConditionTrue())
|
||||
return 0;
|
||||
|
||||
GUIScrollList::NotifyVarChange(varName, value);
|
||||
|
||||
// Check to see if the variable that we are using to store the list selected value has been updated
|
||||
if (varName == mVariable) {
|
||||
int i, listSize = mList.size();
|
||||
|
||||
@@ -145,11 +145,11 @@ int GUIPartitionList::Update(void)
|
||||
|
||||
int GUIPartitionList::NotifyVarChange(const std::string& varName, const std::string& value)
|
||||
{
|
||||
GUIScrollList::NotifyVarChange(varName, value);
|
||||
|
||||
if(!isConditionTrue())
|
||||
return 0;
|
||||
|
||||
GUIScrollList::NotifyVarChange(varName, value);
|
||||
|
||||
if (varName == mVariable && !mUpdate)
|
||||
{
|
||||
if (ListType == "storage") {
|
||||
|
||||
Reference in New Issue
Block a user