- add clearBackgroundColor to use default (defined by style) again

[enigma2.git] / lib / gui / ewidgetdesktop.cpp

diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index bb6c7c39b74efc743471fc648af595626bcfc5f7..24fb334b5ec88ed9dd6fdf23b064620181697fc7 100644 (file)
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -42,11 +42,10 @@ void eWidgetDesktop::calcWidgetClipRegion(eWidget *widget, gRegion &parent_visib
 
 void eWidgetDesktop::recalcClipRegions()
 {
-       gRegion screen = gRegion(eRect(ePoint(0, 0), m_screen_size));
+       m_background_region = gRegion(eRect(ePoint(0, 0), m_screen_size));
        
        for (ePtrList<eWidget>::iterator i(m_root.begin()); i != m_root.end(); ++i)
-               calcWidgetClipRegion(*i, screen);
-//     dumpRegion(screen);
+               calcWidgetClipRegion(*i, m_background_region);
 }
 
 void eWidgetDesktop::invalidate(const gRegion &region)
@@ -56,12 +55,42 @@ void eWidgetDesktop::invalidate(const gRegion &region)
        m_dirty_region |= region;
 }
 
+void eWidgetDesktop::setBackgroundColor(gRGB col)
+{
+       m_background_color = col;
+       
+               /* if there's something visible from the background, redraw it with the new color. */
+       if (m_dc && m_background_region.valid() && !m_background_region.empty())
+       {
+                       /* todo: split out "setBackgroundColor / clear"... maybe? */
+               gPainter painter(m_dc);
+               painter.resetClip(m_background_region);
+               painter.setBackgroundColor(m_background_color);
+               painter.clear();
+       }
+}
+
+void eWidgetDesktop::setPalette(gPixmap &pm)
+{
+       ASSERT(m_dc);
+       gPainter painter(m_dc);
+       painter.setPalette(&pm);
+}
+
 void eWidgetDesktop::paint()
 {
        gPainter painter(m_dc);
                /* walk all root windows. */
        for (ePtrList<eWidget>::iterator i(m_root.begin()); i != m_root.end(); ++i)
                i->doPaint(painter, m_dirty_region);
+       m_dirty_region &= m_background_region;
+       
+       painter.resetClip(m_dirty_region);
+       painter.setBackgroundColor(m_background_color);
+       painter.clear();
+       
+       painter.flush();
+       
        m_dirty_region = gRegion();
 }
 
@@ -86,6 +115,21 @@ void eWidgetDesktop::setRedrawTask(eMainloop &ml)
                m_timer->start(0, 1);
 }
 
+void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
+{
+       eDebug("widgetDesktop: make compatible pixmap of %p\n", &pm);
+       if (!m_dc)
+       {
+               eWarning("eWidgetDesktop: no DC to make pixmap compatible with!");
+               return;
+       }
+       eDebug("painter..");
+       gPainter painter(m_dc);
+       eDebug("merge!");
+       painter.mergePalette(&pm);
+       eDebug("gone!");
+}
+
 eWidgetDesktop::eWidgetDesktop(eSize size): m_screen_size(size), m_mainloop(0), m_timer(0)
 {
 }