X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf82503dcba2b12fc921040397a0387d6dea9dbb..73e392106d840775a16f2d1ff71a4bc0b1992b8f:/lib/gui/ewidget.cpp

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index b4c24d86..8a396ad3 100644
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -23,6 +23,8 @@ eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->
 
 	m_current_focus = 0;
 	m_focus_owner = 0;
+	
+	m_notify_child_on_position_change = 1;
 }
 
 void eWidget::move(ePoint pos)
@@ -32,9 +34,17 @@ void eWidget::move(ePoint pos)
 	if (m_position == pos)
 		return;
 
+			/* ?? what about native move support? */
+	invalidate();
+
 	m_position = pos;
 	
 	event(evtChangedPosition);
+	
+	if (m_notify_child_on_position_change)
+		for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+			i->event(evtParentChangedPosition);
+		
 	recalcClipRegionsWhenVisible();
 	
 		/* try native move if supported. */
@@ -61,6 +71,11 @@ void eWidget::resize(eSize size)
 	
 	invalidate();
 	event(evtChangedSize);
+
+	if (m_notify_child_on_position_change)
+		for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+			i->event(evtParentChangedPosition); /* position/size is the same here */
+
 	recalcClipRegionsWhenVisible();	
 	invalidate();
 }
@@ -97,16 +112,25 @@ void eWidget::show()
 {
 	if (m_vis & wVisShow)
 		return;
-	
-	m_vis |=  wVisShow;
 
+	m_vis |= wVisShow;
+	
 		/* TODO: optimize here to only recalc what's required. possibly merge with hide. */
 	eWidget *root = this;
 	ePoint abspos = position();
 	while (root && !root->m_desktop)
 	{
 		root = root->m_parent;
-		assert(root);
+		if (!root)
+		{
+				/* oops: our root widget does not have a desktop associated. 
+					probably somebody already erased the root, but tries some
+					operations on a child window. 
+					
+					ignore them for now. */
+			/* assert(root); */
+			return;
+		}
 		abspos += root->position();
 	}
 
@@ -137,6 +161,8 @@ void eWidget::hide()
 	while (root && !root->m_desktop)
 	{
 		root = root->m_parent;
+		if (!root)
+			return;
 		abspos += root->position();
 	}
 	assert(root->m_desktop);
@@ -179,10 +205,29 @@ void eWidget::setZPosition(int z)
 
 void eWidget::setTransparent(int transp)
 {
-	if (transp)
-		m_vis |= wVisTransparent;
-	else
-		m_vis &=~wVisTransparent;
+	if (isTransparent() != transp)
+	{
+		if (transp)
+			m_vis |= wVisTransparent;
+		else
+			m_vis &=~wVisTransparent;
+		recalcClipRegionsWhenVisible();
+	}
+}
+
+ePoint eWidget::getAbsolutePosition()
+{
+	eWidget *root = this;
+	ePoint abspos = position();
+
+	while (root && !root->m_desktop)
+	{
+		root = root->m_parent;
+		assert(root);
+		abspos += root->position();
+	}
+
+	return abspos;
 }
 
 void eWidget::mayKillFocus()
@@ -202,12 +247,11 @@ eWidget::~eWidget()
 
 	m_parent = 0;
 
-		/* destroy all childs */
+		/* tell all childs that the parent is not anymore existing */
 	ePtrList<eWidget>::iterator i(m_childs.begin());
 	while (i != m_childs.end())
 	{
-		(*i)->m_parent = 0;
-		delete *i;
+		(*i)->parentRemoved();
 		i = m_childs.erase(i);
 	}
 }
@@ -272,6 +316,11 @@ void eWidget::recalcClipRegionsWhenVisible()
 	} while(1);
 }
 
+void eWidget::parentRemoved()
+{
+	m_parent = 0;
+}
+
 int eWidget::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -294,6 +343,15 @@ int eWidget::event(int event, void *data, void *data2)
 				painter.setBackgroundColor(m_background_color);
 				painter.clear();
 			}
+		} else
+		{
+			eWidget *w = this;
+			
+			while (w && !w->m_have_background_color)
+				w = w->m_parent;
+
+			if (w)
+				painter.setBackgroundColor(w->m_background_color);
 		}
 		break;
 	}
@@ -303,10 +361,12 @@ int eWidget::event(int event, void *data, void *data2)
 		m_size = *static_cast<eSize*>(data);
 		break;
 	case evtChangedSize:
-	{
 		m_clip_region = gRegion(eRect(ePoint(0, 0),  m_size));
 		break;
-	}
+	case evtParentChangedPosition:
+		for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+			i->event(evtParentChangedPosition);
+		break;
 	case evtFocusGot:
 		m_focus_owner = (eWidget*)data;
 		break;