From 35278519b9b44c9543126e06841b1cfb8510eb82 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sat, 15 Oct 2005 23:52:16 +0000 Subject: [PATCH] fix: invalidate in non-visible widget invalidated visible stuff --- lib/gui/ewidgetdesktop.cpp | 15 ++++++++++++++- lib/gui/ewidgetdesktop.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp index dcc2ef60..fb0f39dd 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::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::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; } @@ -387,3 +393,10 @@ void eWidgetDesktop::notify() { redrawComposition(1); } + +void eWidgetDesktop::clearVisibility(eWidget *widget) +{ + widget->m_visible_with_childs = gRegion(); + for (ePtrList::iterator i(widget->m_childs.begin()); i != widget->m_childs.end(); ++i) + clearVisibility(*i); +} diff --git a/lib/gui/ewidgetdesktop.h b/lib/gui/ewidgetdesktop.h index 117138bd..9fbe1bcb 100644 --- a/lib/gui/ewidgetdesktop.h +++ b/lib/gui/ewidgetdesktop.h @@ -81,6 +81,8 @@ private: void redrawComposition(int notifed); void notify(); + + void clearVisibility(eWidget *widget); }; #endif -- 2.30.2