Merge branch 'bug_537_vobsub' into experimental

[vuplus_dvbapp] / lib / gui / epixmap.h

diff --git a/lib/gui/epixmap.h b/lib/gui/epixmap.h
index 5440f11..2db26f2 100644 (file)
--- a/lib/gui/epixmap.h
+++ b/lib/gui/epixmap.h
@@ -1,18 +1,22 @@
-#ifndef __lib_gui_epximap_h
+#ifndef __lib_gui_epixmap_h
 #define __lib_gui_epixmap_h
 
 #include <lib/gui/ewidget.h>
 
 class ePixmap: public eWidget
 {
-       bool m_alphatest;
+       int m_alphatest;
+       int m_scale;
 public:
        ePixmap(eWidget *parent);
-       
+
        void setPixmap(gPixmap *pixmap);
        void setPixmap(ePtr<gPixmap> &pixmap);
        void setPixmapFromFile(const char *filename);
-       void setAlphatest(bool alphatest);
+       void setAlphatest(int alphatest); /* 1 for alphatest, 2 for alphablend */
+       void setScale(int scale);
+       void setBorderWidth(int pixel);
+       void setBorderColor(const gRGB &color);
 protected:
        ePtr<gPixmap> m_pixmap;
        int event(int event, void *data=0, void *data2=0);
@@ -22,6 +26,9 @@ private:
        {
                evtChangedPixmap = evtUserWidget,
        };
+       bool m_have_border_color;
+       int m_border_width;
+       gRGB m_border_color;
 };
 
 #endif