- serialize modal screens

- allow stacking modal screens
- allowing hiding modals
- replace many IsVisible checks with virtual isVisible() checks in IGUIElement 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2406 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IGUIElement.h

@@ -358,7 +358,7 @@ public:
 
 		core::list<IGUIElement*>::Iterator it = Children.getLast();
 
-		if (IsVisible)
+		if (isVisible())
 		{
 			while(it != Children.end())
 			{
@@ -370,7 +370,7 @@ public:
 			}
 		}
 
-		if (IsVisible && isPointInside(point))
+		if (isVisible() && isPointInside(point))
 			target = this;
 
 		return target;
@@ -425,7 +425,7 @@ public:
 	//! Draws the element and its children.
 	virtual void draw()
 	{
-		if ( IsVisible )
+		if ( isVisible() )
 		{
 			core::list<IGUIElement*>::Iterator it = Children.begin();
 			for (; it != Children.end(); ++it)
@@ -437,7 +437,7 @@ public:
 	//! animate the element and its children.
 	virtual void OnPostRender(u32 timeMs)
 	{
-		if ( IsVisible )
+		if ( isVisible() )
 		{
 			core::list<IGUIElement*>::Iterator it = Children.begin();
 			for (; it != Children.end(); ++it)

source/Irrlicht/CGUIModalScreen.cpp

@@ -29,23 +29,70 @@ CGUIModalScreen::CGUIModalScreen(IGUIEnvironment* environment, IGUIElement* pare
 	setTabGroup(true);
 }
 
+bool CGUIModalScreen::canTakeFocus(IGUIElement* target) const
+{
+    return (target && (target == this // this element can take it
+                        || isMyChild(target)    // own childs also
+                        || (target->getType() == EGUIET_MODAL_SCREEN )// other modals also fine
+                        || (target->getParent() && target->getParent()->getType() == EGUIET_MODAL_SCREEN )))   // childs of other modals will do
+            ;
+}
+
+bool CGUIModalScreen::isVisible() const
+{
+    // any parent invisible?
+    IGUIElement * parentElement = getParent();
+    while ( parentElement )
+    {
+        if ( !parentElement->isVisible() )
+            return false;
+        parentElement = parentElement->getParent();
+    }
+
+    // if we have no children then the modal is probably abused as a way to block input
+    if ( Children.empty() )
+    {
+        return IGUIElement::isVisible();
+    }
+
+    // any child visible?
+    bool visible = false;
+    core::list<IGUIElement*>::ConstIterator it = Children.begin();
+    for (; it != Children.end(); ++it)
+    {
+        if ( (*it)->isVisible() )
+        {
+            visible = true;
+            break;
+        }
+    }
+    return visible;
+}
+
+bool CGUIModalScreen::isPointInside(const core::position2d<s32>& point) const
+{
+    return true;
+}
 
 //! called if an event happened.
 bool CGUIModalScreen::OnEvent(const SEvent& event)
 {
+    if (!IsEnabled || !isVisible() )
+        return IGUIElement::OnEvent(event);
+
     switch(event.EventType)
 	{
 	case EET_GUI_EVENT:
 		switch(event.GUIEvent.EventType)
 		{
 		case EGET_ELEMENT_FOCUSED:
-			// only children are allowed the focus
-			if (event.GUIEvent.Caller != this && !isMyChild(event.GUIEvent.Caller))
+			if ( !canTakeFocus(event.GUIEvent.Caller))
+			{
 				Environment->setFocus(this);
+			}
 			return false;
 		case EGET_ELEMENT_FOCUS_LOST:
-			// only children are allowed the focus
-			if (!(isMyChild(event.GUIEvent.Element) || event.GUIEvent.Element == this))
+			if ( !canTakeFocus(event.GUIEvent.Element))
             {
 				MouseDownTime = os::Timer::getTime();
 				return true;
@@ -116,7 +163,9 @@ void CGUIModalScreen::removeChild(IGUIElement* child)
 	IGUIElement::removeChild(child);
 
 	if (Children.empty())
+	{
 		remove();
+	}
 }
 
 
@@ -148,13 +197,13 @@ void CGUIModalScreen::updateAbsolutePosition()
 //! Writes attributes of the element.
 void CGUIModalScreen::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
-	// these don't get serialized, their status is added to their children.
+	IGUIElement::serializeAttributes(out,options);
 }
 
 //! Reads attributes of the element
 void CGUIModalScreen::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
-	// these don't get deserialized. children create them if required
+	IGUIElement::deserializeAttributes(in, options);
 }
 
 

source/Irrlicht/CGUIModalScreen.h

@@ -38,12 +38,23 @@ namespace gui
 		//! Updates the absolute position.
 		virtual void updateAbsolutePosition();
 
+        //! Modalscreen is not a typical element, but rather acts like a state for it's children.
+        //! isVisible is overriden to give this a useful behaviour, so that a modal will no longer
+        //! be active when its parent is invisible or all its children are invisible.
+		virtual bool isVisible() const;
+
+		//! Modals are infinite so every point is inside
+		virtual bool isPointInside(const core::position2d<s32>& point) const;
+
 		//! Writes attributes of the element.
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
 
 		//! Reads attributes of the element
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
 
+    protected:
+        virtual bool canTakeFocus(IGUIElement* target) const;
+
 	private:
 
 		u32 MouseDownTime;