git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make epixmap load images relative to enigma2 DATADIR
[enigma2.git]
/
lib
/
gui
/
epixmap.cpp
diff --git
a/lib/gui/epixmap.cpp
b/lib/gui/epixmap.cpp
index dc998531317108e9cb39cdaff12d7b322e9351d9..ca3e456275de817cebab05c99da3d227bd663d61 100644
(file)
--- a/
lib/gui/epixmap.cpp
+++ b/
lib/gui/epixmap.cpp
@@
-14,8
+14,12
@@
void ePixmap::setPixmap(gPixmap *pixmap)
void ePixmap::setPixmapFromFile(const char *filename)
{
void ePixmap::setPixmapFromFile(const char *filename)
{
- loadPNG(m_pixmap, filename);
-
+ // use direct filename for absolute path or relative to enigma2 DATADIR otherwise
+ if (filename[0] == '/')
+ loadPNG(m_pixmap, filename);
+ else
+ loadPNG(m_pixmap, strcat(DATADIR "/enigma2/", filename));
+
// TODO
getDesktop()->makeCompatiblePixmap(*m_pixmap);
event(evtChangedPixmap);
// TODO
getDesktop()->makeCompatiblePixmap(*m_pixmap);
event(evtChangedPixmap);