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

diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index 04bc85d9..4d0c0a9b 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. */
@@ -290,14 +299,17 @@ void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
 		return;
 	}
 
-	ePtr<gDC> pixmap_dc = new gDC(&pm);
-	gPainter pixmap_painter(pixmap_dc);
-	
 	ePtr<gPixmap> target_pixmap;
 	m_screen.m_dc->getPixmap(target_pixmap);
 	
 	assert(target_pixmap);
 	
+	if (target_pixmap->surface && target_pixmap->surface->bpp > 8)
+		return;
+
+	ePtr<gDC> pixmap_dc = new gDC(&pm);
+	gPainter pixmap_painter(pixmap_dc);
+	
 	pixmap_painter.mergePalette(target_pixmap);
 }
 
@@ -318,6 +330,7 @@ eWidgetDesktop::eWidgetDesktop(eSize size): m_mainloop(0), m_timer(0)
 	m_screen.m_dirty_region = gRegion(eRect(ePoint(0, 0), size));
 	m_screen.m_screen_size = size;
 	m_require_redraw = 0;
+	m_style_id = 0;
 
 	CONNECT(gRC::getInstance()->notify, eWidgetDesktop::notify);
 	setCompositionMode(cmImmediate);