- 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 1b5cf9b2ae01e1f991d19efd529e34b8c971773d..24fb334b5ec88ed9dd6fdf23b064620181697fc7 100644 (file)
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -55,7 +55,7 @@ void eWidgetDesktop::invalidate(const gRegion &region)
        m_dirty_region |= region;
 }
 
        m_dirty_region |= region;
 }
 

-void eWidgetDesktop::setBackgroundColor(gColor col)
+void eWidgetDesktop::setBackgroundColor(gRGB col)

 {
        m_background_color = col;
        
 {
        m_background_color = col;
        


@@ -70,6 +70,13 @@ void eWidgetDesktop::setBackgroundColor(gColor col)
        }
 }
 
        }
 }
 

+void eWidgetDesktop::setPalette(gPixmap &pm)
+{
+       ASSERT(m_dc);
+       gPainter painter(m_dc);
+       painter.setPalette(&pm);
+}
+

 void eWidgetDesktop::paint()
 {
        gPainter painter(m_dc);
 void eWidgetDesktop::paint()
 {
        gPainter painter(m_dc);


@@ -82,6 +89,8 @@ void eWidgetDesktop::paint()
        painter.setBackgroundColor(m_background_color);
        painter.clear();
        
        painter.setBackgroundColor(m_background_color);
        painter.clear();
        

+       painter.flush();
+       

        m_dirty_region = gRegion();
 }
 
        m_dirty_region = gRegion();
 }
 


@@ -106,6 +115,21 @@ void eWidgetDesktop::setRedrawTask(eMainloop &ml)
                m_timer->start(0, 1);
 }
 
                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)
 {
 }
 eWidgetDesktop::eWidgetDesktop(eSize size): m_screen_size(size), m_mainloop(0), m_timer(0)
 {
 }