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/console.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gui/console.cpp') diff --git a/gui/console.cpp b/gui/console.cpp index 517a7c293..5d0ed3ec3 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -103,7 +103,7 @@ extern "C" void gui_print_overwrite(const char *fmt, ...) return; } -GUIConsole::GUIConsole(xml_node<>* node) +GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node) { xml_attribute<>* attr; xml_node<>* child; @@ -242,6 +242,9 @@ int GUIConsole::RenderConsole(void) int GUIConsole::Render(void) { + if(!isConditionTrue()) + return 0; + if (mSlideout && mSlideoutState == hidden) return RenderSlideout(); @@ -250,6 +253,9 @@ int GUIConsole::Render(void) int GUIConsole::Update(void) { + if(!isConditionTrue()) + return 0; + if (mSlideout && mSlideoutState != visible) { if (mSlideoutState == hidden) @@ -326,6 +332,9 @@ int GUIConsole::IsInRegion(int x, int y) // Return 0 on success, >0 to ignore remainder of touch, and <0 on error int GUIConsole::NotifyTouch(TOUCH_STATE state, int x, int y) { + if(!isConditionTrue()) + return -1; + if (mSlideout && mSlideoutState == hidden) { if (state == TOUCH_START) -- cgit v1.2.3