From fa30aca94a41f78e9442dae9874657343786acb4 Mon Sep 17 00:00:00 2001 From: that Date: Fri, 13 Feb 2015 01:22:22 +0100 Subject: 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 --- gui/fileselector.cpp | 4 ++-- gui/listbox.cpp | 4 ++-- gui/partitionlist.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index 4a26349cd..319b11b96 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -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, ""); diff --git a/gui/listbox.cpp b/gui/listbox.cpp index 89a2c0322..37ba958c1 100644 --- a/gui/listbox.cpp +++ b/gui/listbox.cpp @@ -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(); diff --git a/gui/partitionlist.cpp b/gui/partitionlist.cpp index 7e5a74fa5..e9c16524a 100644 --- a/gui/partitionlist.cpp +++ b/gui/partitionlist.cpp @@ -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") { -- cgit v1.2.3