git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lower prio for subservice quickzap actions (needed for working seek actions)
[enigma2.git]
/
lib
/
gui
/
epixmap.cpp
diff --git
a/lib/gui/epixmap.cpp
b/lib/gui/epixmap.cpp
index e4e4acc31300ac0f007ec8f6dcdddc65f24891c3..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>
#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;
void ePixmap::setPixmap(gPixmap *pixmap)
{
m_pixmap = pixmap;
@@
-15,9
+22,15
@@
void ePixmap::setPixmap(gPixmap *pixmap)
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);
}
@@
-35,7
+48,7
@@
int ePixmap::event(int event, void *data, void *data2)
gPainter &painter = *(gPainter*)data2;
if (m_pixmap)
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;
}
return 0;
}