git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ca language
[enigma2.git]
/
lib
/
gui
/
epixmap.cpp
diff --git
a/lib/gui/epixmap.cpp
b/lib/gui/epixmap.cpp
index 3a377f14c78ad5ee9280fb8870f18d34fd1f82b7..4e15b4eb5ba85c956b149348c0596be040381ced 100644
(file)
--- a/
lib/gui/epixmap.cpp
+++ b/
lib/gui/epixmap.cpp
@@
-10,6
+10,7
@@
ePixmap::ePixmap(eWidget *parent)
void ePixmap::setAlphatest(bool alphatest)
{
m_alphatest = alphatest;
void ePixmap::setAlphatest(bool alphatest)
{
m_alphatest = alphatest;
+ setTransparent(alphatest);
}
void ePixmap::setPixmap(gPixmap *pixmap)
}
void ePixmap::setPixmap(gPixmap *pixmap)
@@
-21,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);
}