revert to 750ms delay for motor powerup.. 200ms is not really enough

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

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 4e15b4eb5ba85c956b149348c0596be040381ced..69da944c83e781f7c0d0a0cf7523c66e6e2b3a34 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -19,6 +19,12 @@ void ePixmap::setPixmap(gPixmap *pixmap)
        event(evtChangedPixmap);
 }
 
+void ePixmap::setPixmap(ePtr<gPixmap> &pixmap)
+{
+       m_pixmap = pixmap;
+       event(evtChangedPixmap);
+}
+
 void ePixmap::setPixmapFromFile(const char *filename)
 {
        loadPNG(m_pixmap, filename);
@@ -34,6 +40,17 @@ void ePixmap::setPixmapFromFile(const char *filename)
        event(evtChangedPixmap);
 }
 
+void ePixmap::checkSize()
+{
+                       /* when we have no pixmap, or a pixmap of different size, we need 
+          to enable transparency in any case. */
+       if (m_pixmap && m_pixmap->size() == size() && !m_alphatest)
+               setTransparent(0);
+       else
+               setTransparent(1);
+               /* fall trough. */
+}
+
 int ePixmap::event(int event, void *data, void *data2)
 {
        switch (event)
@@ -43,8 +60,11 @@ int ePixmap::event(int event, void *data, void *data2)
                ePtr<eWindowStyle> style;
                
                getStyle(style);
-               
-//             eWidget::event(event, data, data2);
+
+//     we don't clear the background before because of performance reasons.
+//     when the pixmap is too small to fix the whole widget area, the widget is
+//     transparent anyway, so the background is already painted.
+//             eWidget::event(event, data, data2); 
                
                gPainter &painter = *(gPainter*)data2;
                if (m_pixmap)
@@ -53,8 +73,12 @@ int ePixmap::event(int event, void *data, void *data2)
                return 0;
        }
        case evtChangedPixmap:
+               checkSize();
                invalidate();
                return 0;
+       case evtChangedSize:
+               checkSize();
+                       /* fall trough. */
        default:
                return eWidget::event(event, data, data2);
        }