re-enable alphablend

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

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 797c675991f60ad4fc26d7169d11300cd2bd5bbf..84fec3232335a09e7d87f8864257cd9bbc53c434 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -2,25 +2,55 @@
 #include <lib/gdi/epng.h>
 #include <lib/gui/ewidgetdesktop.h>
 
 #include <lib/gdi/epng.h>
 #include <lib/gui/ewidgetdesktop.h>
 

-ePixmap::ePixmap(eWidget *parent): eWidget(parent)
+ePixmap::ePixmap(eWidget *parent)
+       :eWidget(parent), m_alphatest(false)

 {
 }
 
 {
 }
 

+void ePixmap::setAlphatest(int alphatest)
+{
+       m_alphatest = alphatest;
+       setTransparent(alphatest);
+}
+

 void ePixmap::setPixmap(gPixmap *pixmap)
 {
        m_pixmap = pixmap;
        event(evtChangedPixmap);
 }
 
 void ePixmap::setPixmap(gPixmap *pixmap)
 {
        m_pixmap = pixmap;
        event(evtChangedPixmap);
 }
 

+void ePixmap::setPixmap(ePtr<gPixmap> &pixmap)
+{
+       m_pixmap = pixmap;
+       event(evtChangedPixmap);
+}
+

 void ePixmap::setPixmapFromFile(const char *filename)
 {
        loadPNG(m_pixmap, filename);
        
 void ePixmap::setPixmapFromFile(const char *filename)
 {
        loadPNG(m_pixmap, filename);
        

-               // TODO
-       getDesktop()->makeCompatiblePixmap(*m_pixmap);
+       if (!m_pixmap)
+       {
+               eDebug("ePixmap::setPixmapFromFile: loadPNG failed");
+               return;
+       }
+       
+               // TODO: This only works for desktop 0
+       getDesktop(0)->makeCompatiblePixmap(*m_pixmap);

        event(evtChangedPixmap);
 }
 
        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)
 int ePixmap::event(int event, void *data, void *data2)
 {
        switch (event)


@@ -30,18 +60,34 @@ int ePixmap::event(int event, void *data, void *data2)
                ePtr<eWindowStyle> style;
                
                getStyle(style);
                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 fit 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)
                gPainter &painter = *(gPainter*)data2;
                if (m_pixmap)

-                       painter.blit(m_pixmap, ePoint(0, 0));
-               
+               {
+                       int flags = 0;
+                       if (m_alphatest == 0)
+                               flags = 0;
+                       else if (m_alphatest == 1)
+                               flags = gPainter::BT_ALPHATEST;
+                       else if (m_alphatest == 2)
+                               flags = gPainter::BT_ALPHABLEND;
+                       painter.blit(m_pixmap, ePoint(0, 0), eRect(), flags);
+               }
+

                return 0;
        }
        case evtChangedPixmap:
                return 0;
        }
        case evtChangedPixmap:

+               checkSize();

                invalidate();
                return 0;
                invalidate();
                return 0;

+       case evtChangedSize:
+               checkSize();
+                       /* fall trough. */

        default:
                return eWidget::event(event, data, data2);
        }
        default:
                return eWidget::event(event, data, data2);
        }