X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf82503dcba2b12fc921040397a0387d6dea9dbb..fc61bfd83af4aa0174f1edd64912049017996f56:/lib/gui/ewidgetdesktop.cpp

diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index c89cd270..d8de2aec 100644
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -5,18 +5,27 @@
 
 extern void dumpRegion(const gRegion &region);
 
-void eWidgetDesktop::addRootWidget(eWidget *root, int top)
+void eWidgetDesktop::addRootWidget(eWidget *root)
 {
 	assert(!root->m_desktop);
 	
+	int invert_sense = 0;
 		/* buffered mode paints back-to-front, while immediate mode is front-to-back. */
 	if (m_comp_mode == cmBuffered)
-		top = !top;
+		invert_sense = 1;
+	
+	ePtrList<eWidget>::iterator insert_position = m_root.begin();
+	
+	for (;;)
+	{
+		if ((insert_position == m_root.end()) || (invert_sense ^ (insert_position->m_z_position >= root->m_z_position)))
+		{
+			m_root.insert(insert_position, root);
+			break;
+		}
+		++insert_position;
+	}
 	
-	if (top)
-		m_root.push_back(root);
-	else
-		m_root.push_front(root);
 	root->m_desktop = this;
 
 		/* the creation will be postponed. */
@@ -325,6 +334,12 @@ eWidgetDesktop::eWidgetDesktop(eSize size): m_mainloop(0), m_timer(0)
 
 eWidgetDesktop::~eWidgetDesktop()
 {
+		/* tell registered root windows that they no longer have a desktop. */
+	for (ePtrList<eWidget>::iterator i(m_root.begin()); i != m_root.end(); )
+	{
+		i->m_desktop = 0;
+		i = m_root.erase(i);
+	}
 		/* destroy all buffers */
 	setCompositionMode(-1);
 }