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

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

Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522
This commit is contained in:
Vojtech Bocek
2014-02-07 23:58:09 +01:00
committed by Gerrit Code Review
parent f08ada8483
commit ede51c528e
19 changed files with 119 additions and 42 deletions
+10 -1
View File
@@ -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)