X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87bfe5dfced0fb7a4e9839fdafa898261a39c86c..83dc65144ec5b7d412f959afd2abb947580f7121:/lib/gui/ewidget.cpp

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 8cb7d4ae..023caa6a 100644
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -8,6 +8,7 @@ eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->
 	m_vis = 0;
 	m_desktop = 0;
 	m_have_background_color = 0;
+	m_z_position = 0;
 	
 	m_client_offset = eSize(0, 0);
 	
@@ -16,7 +17,7 @@ eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->
 	
 	if (m_parent)
 	{
-		m_parent->m_childs.push_back(this);
+		insertIntoParent();
 		m_parent->getStyle(m_style);
 	}
 
@@ -31,6 +32,9 @@ void eWidget::move(ePoint pos)
 	if (m_position == pos)
 		return;
 
+			/* ?? what about native move support? */
+	invalidate();
+
 	m_position = pos;
 	
 	event(evtChangedPosition);
@@ -165,6 +169,25 @@ void eWidget::clearBackgroundColor()
 	m_have_background_color = 0;
 }
 
+void eWidget::setZPosition(int z)
+{
+	m_z_position = z;
+	if (!m_parent)
+		return;
+	
+	m_parent->m_childs.remove(this);
+	
+	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);
@@ -192,19 +215,31 @@ eWidget::~eWidget()
 	}
 }
 
+void eWidget::insertIntoParent()
+{
+	ePtrList<eWidget>::iterator i = m_parent->m_childs.begin();
+	
+	for(;;)
+	{
+		if ((i == m_parent->m_childs.end()) || (i->m_z_position > m_z_position))
+		{
+			m_parent->m_childs.insert(i, this);
+			return;
+		}
+		++i;
+	}
+}
+
 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;
@@ -214,6 +249,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());
 }
@@ -245,15 +285,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;
 	}