fixes to language activation callbacks and using the callbacks in mytest for setting...

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

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 797c675991f60ad4fc26d7169d11300cd2bd5bbf..4e15b4eb5ba85c956b149348c0596be040381ced 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -2,10 +2,17 @@
 #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(bool alphatest)
+{
+       m_alphatest = alphatest;
+       setTransparent(alphatest);
+}
+
 void ePixmap::setPixmap(gPixmap *pixmap)
 {
        m_pixmap = pixmap;
@@ -16,8 +23,14 @@ 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);
 }
 
@@ -31,11 +44,11 @@ int ePixmap::event(int event, void *data, void *data2)
                
                getStyle(style);
                
-               eWidget::event(event, data, data2);
+//             eWidget::event(event, data, data2);
                
                gPainter &painter = *(gPainter*)data2;
                if (m_pixmap)
-                       painter.blit(m_pixmap, ePoint(0, 0));
+                       painter.blit(m_pixmap, ePoint(0, 0), eRect(), m_alphatest?gPainter::BT_ALPHATEST:0);
                
                return 0;
        }