X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a895ba81ff7b76551cd5c1c44083a081ef56106b..6f55cd01cf53108209c299e66c2fe189dc61a344:/lib/gui/ewidget.cpp

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index b047f5fb..3bc6e663 100644
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -32,6 +32,9 @@ void eWidget::move(ePoint pos)
 	if (m_position == pos)
 		return;
 
+			/* ?? what about native move support? */
+	invalidate();
+
 	m_position = pos;
 	
 	event(evtChangedPosition);
@@ -137,6 +140,8 @@ void eWidget::hide()
 	while (root && !root->m_desktop)
 	{
 		root = root->m_parent;
+		if (!root)
+			return;
 		abspos += root->position();
 	}
 	assert(root->m_desktop);
@@ -177,6 +182,14 @@ void eWidget::setZPosition(int z)
 	insertIntoParent(); /* now at the new Z position */
 }
 
+void eWidget::setTransparent(int transp)
+{
+	if (transp)
+		m_vis |= wVisTransparent;
+	else
+		m_vis &=~wVisTransparent;
+}
+
 void eWidget::mayKillFocus()
 {
 	setFocus(0);
@@ -194,12 +207,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);
 	}
 }
@@ -224,14 +236,11 @@ void eWidget::doPaint(gPainter &painter, const gRegion &r)
 	if (m_visible_with_childs.empty())
 		return;
 	
-	gRegion region = r;
+	gRegion region = r, childs = r;
 			/* we were in parent's space, now we are in local space */
 	region.moveBy(-position());
 	
 	painter.moveOffset(position());
-		/* walk all childs */
-	for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
-		i->doPaint(painter, region);
 	
 		/* check if there's anything for us to paint */
 	region &= m_visible_region;
@@ -241,6 +250,11 @@ void eWidget::doPaint(gPainter &painter, const gRegion &r)
 		painter.resetClip(region);
 		event(evtPaint, &region, &painter);
 	}
+
+	childs.moveBy(-position());
+		/* walk all childs */
+	for (ePtrList<eWidget>::iterator i(m_childs.begin()); i != m_childs.end(); ++i)
+		i->doPaint(painter, childs);
 	
 	painter.moveOffset(-position());
 }
@@ -262,6 +276,11 @@ void eWidget::recalcClipRegionsWhenVisible()
 	} while(1);
 }
 
+void eWidget::parentRemoved()
+{
+	m_parent = 0;
+}
+
 int eWidget::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -272,15 +291,22 @@ int eWidget::event(int event, void *data, void *data2)
 		
 //		eDebug("eWidget::evtPaint");
 //		dumpRegion(*(gRegion*)data);
-		if (!m_have_background_color)
+		if (!isTransparent())
 		{
-			ePtr<eWindowStyle> style;
-			if (!getStyle(style))
-				style->paintBackground(painter, ePoint(0, 0), size());
+			if (!m_have_background_color)
+			{
+				ePtr<eWindowStyle> style;
+				if (!getStyle(style))
+					style->paintBackground(painter, ePoint(0, 0), size());
+			} else
+			{
+				painter.setBackgroundColor(m_background_color);
+				painter.clear();
+			}
 		} else
 		{
-			painter.setBackgroundColor(m_background_color);
-			painter.clear();
+			if (m_have_background_color)
+				painter.setBackgroundColor(m_background_color);
 		}
 		break;
 	}