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

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 7586c627..b047f5fb 100644
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -3,18 +3,21 @@
 
 extern void dumpRegion(const gRegion &region);
 
-eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
+eWidget::eWidget(eWidget *parent): m_animation(this), m_parent(parent ? parent->child() : 0)
 {
 	m_vis = 0;
 	m_desktop = 0;
 	m_have_background_color = 0;
+	m_z_position = 0;
+	
+	m_client_offset = eSize(0, 0);
 	
 	if (m_parent)
 		m_vis = wVisShow;
-		
+	
 	if (m_parent)
 	{
-		m_parent->m_childs.push_back(this);
+		insertIntoParent();
 		m_parent->getStyle(m_style);
 	}
 
@@ -24,20 +27,19 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 
 void eWidget::move(ePoint pos)
 {
+	pos = pos + m_client_offset;
+	
 	if (m_position == pos)
 		return;
-	
+
 	m_position = pos;
 	
-		/* we invalidate before and after the move to
-		   cause a correct redraw. The area which is
-		   included both before and after isn't redrawn
-		   twice because a invalidate doesn't immediately
-		   redraws the region. */
-	invalidate();
 	event(evtChangedPosition);
-	recalcClipRegionsWhenVisible();	
-	invalidate();
+	recalcClipRegionsWhenVisible();
+	
+		/* try native move if supported. */
+	if ((m_vis & wVisShow) && ((!m_desktop) || m_desktop->movedWidget(this)))
+		invalidate();
 }
 
 void eWidget::resize(eSize size)
@@ -49,11 +51,13 @@ void eWidget::resize(eSize size)
 		   fits into the other completely, and invalidate
 		   only once. */
 	eSize old_size = m_size;
-	eSize offset = eSize(0, 0);
-	event(evtWillChangeSize, &size, &offset);
+	eSize old_offset = m_client_offset;
+	m_client_offset = eSize(0, 0);
+	event(evtWillChangeSize, &size, &m_client_offset);
 	if (old_size == m_size)
 		return;
-	move(position() + offset);
+	
+	move(position() - old_offset);
 	
 	invalidate();
 	event(evtChangedSize);
@@ -106,7 +110,7 @@ void eWidget::show()
 		abspos += root->position();
 	}
 
-	root->m_desktop->recalcClipRegions();
+	root->m_desktop->recalcClipRegions(root);
 
 	gRegion abs = m_visible_with_childs;
 	abs.moveBy(abspos);
@@ -140,7 +144,7 @@ void eWidget::hide()
 	gRegion abs = m_visible_with_childs;
 	abs.moveBy(abspos);
 
-	root->m_desktop->recalcClipRegions();
+	root->m_desktop->recalcClipRegions(root);
 	root->m_desktop->invalidate(abs);
 }
 
@@ -162,6 +166,17 @@ 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::mayKillFocus()
 {
 	setFocus(0);
@@ -189,6 +204,21 @@ 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())
@@ -224,7 +254,7 @@ void eWidget::recalcClipRegionsWhenVisible()
 			break;
 		if (t->m_desktop)
 		{
-			t->m_desktop->recalcClipRegions();
+			t->m_desktop->recalcClipRegions(t);
 			break;
 		}
 		t = t->m_parent;
@@ -278,7 +308,6 @@ int eWidget::event(int event, void *data, void *data2)
 
 void eWidget::setFocus(eWidget *focus)
 {
-	eDebug("setFocus in %p to %p, was %p", this, focus, m_current_focus);
 	if (m_current_focus)
 		m_current_focus->event(evtFocusLost, this);