git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
[enigma2.git]
/
lib
/
gui
/
epixmap.h
diff --git
a/lib/gui/epixmap.h
b/lib/gui/epixmap.h
index ce1e7a56978757461bfd245a1a6a670796d80b50..6280fb34f36eb1cca4252b9bd10dc186242d578c 100644
(file)
--- a/
lib/gui/epixmap.h
+++ b/
lib/gui/epixmap.h
@@
-1,20
+1,24
@@
-#ifndef __lib_gui_ep
xi
map_h
+#ifndef __lib_gui_ep
ix
map_h
#define __lib_gui_epixmap_h
#include <lib/gui/ewidget.h>
class ePixmap: public eWidget
{
#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);
public:
ePixmap(eWidget *parent);
-
+
void setPixmap(gPixmap *pixmap);
void setPixmap(gPixmap *pixmap);
+ void setPixmap(ePtr<gPixmap> &pixmap);
void setPixmapFromFile(const char *filename);
void setPixmapFromFile(const char *filename);
- void setAlphatest(bool alphatest);
+ void setAlphatest(int alphatest); /* 1 for alphatest, 2 for alphablend */
+ void setScale(int scale);
protected:
ePtr<gPixmap> m_pixmap;
int event(int event, void *data=0, void *data2=0);
protected:
ePtr<gPixmap> m_pixmap;
int event(int event, void *data=0, void *data2=0);
+ void checkSize();
private:
enum eLabelEvent
{
private:
enum eLabelEvent
{