From ede51c528e5cebc7f1930d5c9da541e7d11c0138 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Fri, 7 Feb 2014 23:58:09 +0100 Subject: Conditional -> GUIObject and make all gui objects children of GUIObject Signed-off-by: Vojtech Bocek Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522 --- gui/progressbar.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gui/progressbar.cpp') diff --git a/gui/progressbar.cpp b/gui/progressbar.cpp index d53fdc19f..9c80eb40a 100644 --- a/gui/progressbar.cpp +++ b/gui/progressbar.cpp @@ -25,7 +25,7 @@ extern "C" { #include "rapidxml.hpp" #include "objects.hpp" -GUIProgressBar::GUIProgressBar(xml_node<>* node) +GUIProgressBar::GUIProgressBar(xml_node<>* node) : GUIObject(node) { xml_attribute<>* attr; xml_node<>* child; @@ -82,6 +82,9 @@ GUIProgressBar::GUIProgressBar(xml_node<>* node) int GUIProgressBar::Render(void) { + if(!isConditionTrue()) + return 0; + // This handles making sure timing updates occur Update(); return RenderInternal(); @@ -102,6 +105,9 @@ int GUIProgressBar::RenderInternal(void) int GUIProgressBar::Update(void) { + if(!isConditionTrue()) + return 0; + std::string str; int min, max, cur, pos; @@ -168,6 +174,9 @@ int GUIProgressBar::Update(void) int GUIProgressBar::NotifyVarChange(std::string varName, std::string value) { + if(!isConditionTrue()) + return 0; + static int nextPush = 0; if (varName.empty()) -- cgit v1.2.3