commit ede51c528e5cebc7f1930d5c9da541e7d11c0138
author Vojtech Bocek <vbocek@gmail.com> Fri Feb 07 23:58:09 2014 +0100
committer Gerrit Code Review <gerrit2@gerrit> Wed Feb 12 18:30:41 2014 +0100
tree 6ea3d7b2a5881cc0489f0b72ffeacd6d4adf7348
parent f08ada848363553087b51b59a0a3f883d3344c74

Conditional -> GUIObject and make all gui objects children of GUIObject

Signed-off-by: Vojtech Bocek <vbocek@gmail.com>

Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522

gui/progressbar.cpp

diff --git a/gui/progressbar.cpp b/gui/progressbar.cpp
index d53fdc1..9c80eb4 100644
--- a/gui/progressbar.cpp
+++ b/gui/progressbar.cpp
@@ -25,7 +25,7 @@
 #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 @@
 
 int GUIProgressBar::Render(void)
 {
+	if(!isConditionTrue())
+		return 0;
+
 	// This handles making sure timing updates occur
 	Update();
 	return RenderInternal();
@@ -102,6 +105,9 @@
 
 int GUIProgressBar::Update(void)
 {
+	if(!isConditionTrue())
+		return 0;
+
 	std::string str;
 	int min, max, cur, pos;
 
@@ -168,6 +174,9 @@
 
 int GUIProgressBar::NotifyVarChange(std::string varName, std::string value)
 {
+	if(!isConditionTrue())
+		return 0;
+
 	static int nextPush = 0;
 
 	if (varName.empty())