X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4ebd765cac9f8a7ae4934147ed876a9e228eeb8d..3220cd98443043566e3617c564370683d011878e:/lib/gui/ewidgetdesktop.cpp

diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index dcc2ef60..afe1995c 100644
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -66,6 +66,8 @@ void eWidgetDesktop::calcWidgetClipRegion(eWidget *widget, gRegion &parent_visib
 	for (ePtrList<eWidget>::iterator i(widget->m_childs.begin()); i != widget->m_childs.end(); ++i)
 		if (i->m_vis & eWidget::wVisShow)
 			calcWidgetClipRegion(*i, widget->m_visible_region);
+		else
+			clearVisibility(*i);
 }
 
 void eWidgetDesktop::recalcClipRegions(eWidget *root)
@@ -79,7 +81,10 @@ void eWidgetDesktop::recalcClipRegions(eWidget *root)
 		for (ePtrList<eWidget>::iterator i(m_root.begin()); i != m_root.end(); ++i)
 		{
 			if (!(i->m_vis & eWidget::wVisShow))
+			{
+				clearVisibility(i);
 				continue;
+			}
 			
 			gRegion visible_before = i->m_visible_with_childs;
 
@@ -94,10 +99,11 @@ void eWidgetDesktop::recalcClipRegions(eWidget *root)
 		
 		gRegion redraw = (background_before - m_screen.m_background_region) | (m_screen.m_background_region - background_before);
 		invalidate(redraw);
-	} else
+	} else if (m_comp_mode == cmBuffered)
 	{
 		if (!root->m_vis & eWidget::wVisShow)
 		{
+			clearVisibility(root);
 			removeBufferForWidget(root);
 			return;
 		}
@@ -266,7 +272,7 @@ void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
 	if (m_comp_mode != cmImmediate)
 		return;
 	
-	eDebug("widgetDesktop: make compatible pixmap of %p\n", &pm);
+//	eDebug("widgetDesktop: make compatible pixmap of %p", &pm);
 	if (!m_screen.m_dc)
 	{
 		eWarning("eWidgetDesktop: no DC to make pixmap compatible with!");
@@ -387,3 +393,10 @@ void eWidgetDesktop::notify()
 {
 	redrawComposition(1);
 }
+
+void eWidgetDesktop::clearVisibility(eWidget *widget)
+{
+	widget->m_visible_with_childs = gRegion();
+	for (ePtrList<eWidget>::iterator i(widget->m_childs.begin()); i != widget->m_childs.end(); ++i)
+		clearVisibility(*i);
+}