lib/dvb/subtitle.h/cpp: cleanup, fixes for sky brazil 2bit dvb subtitles, add support...

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

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 70ea9d6a7b099c950fd21ec49950ad139d4506ed..f20c1a9fcd6ad9541f9a2952180a4cc295ab7070 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -3,22 +3,37 @@
 #include <lib/gui/ewidgetdesktop.h>
 
 ePixmap::ePixmap(eWidget *parent)
 #include <lib/gui/ewidgetdesktop.h>
 
 ePixmap::ePixmap(eWidget *parent)

-       :eWidget(parent), m_alphatest(false)
+       :eWidget(parent), m_alphatest(false), m_scale(false)

 {
 }
 
 {
 }
 

-void ePixmap::setAlphatest(bool alphatest)
+void ePixmap::setAlphatest(int alphatest)

 {
        m_alphatest = alphatest;
        setTransparent(alphatest);
 }
 
 {
        m_alphatest = alphatest;
        setTransparent(alphatest);
 }
 

+void ePixmap::setScale(int scale)
+{
+       if (m_scale != scale)
+       {
+               m_scale = scale;
+               invalidate();
+       }
+}
+

 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);


@@ -29,11 +44,22 @@ void ePixmap::setPixmapFromFile(const char *filename)
                return;
        }
        
                return;
        }
        

-               // TODO
-       getDesktop()->makeCompatiblePixmap(*m_pixmap);
+               // 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)


@@ -43,18 +69,37 @@ 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), eRect(), m_alphatest?gPainter::BT_ALPHATEST: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;
+                       if (m_scale)
+                               painter.blitScale(m_pixmap, eRect(ePoint(0, 0), size()), eRect(), flags);
+                       else
+                               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);
        }