git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b61f4f
)
TYPE_PIXMAP_ALPHATEST in eListboxMultiContent, fix alphatest
author
Felix Domke
<tmbinc@elitedvb.net>
Thu, 26 Jan 2006 02:00:38 +0000
(
02:00
+0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Thu, 26 Jan 2006 02:00:38 +0000
(
02:00
+0000)
lib/gdi/gpixmap.cpp
patch
|
blob
|
history
lib/gui/elistboxcontent.cpp
patch
|
blob
|
history
lib/gui/elistboxcontent.h
patch
|
blob
|
history
lib/python/Components/TimerList.py
patch
|
blob
|
history
diff --git
a/lib/gdi/gpixmap.cpp
b/lib/gdi/gpixmap.cpp
index e44ee0fa4997a67330ba17f4448b01930b91c0a8..3ebd9a0296f18f5f2c476ce458857bb64a3238c4 100644
(file)
--- a/
lib/gdi/gpixmap.cpp
+++ b/
lib/gdi/gpixmap.cpp
@@
-310,7
+310,7
@@
void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
// use duff's device here!
while (width--)
{
// use duff's device here!
while (width--)
{
- if (
*src==0x01
)
+ if (
!(pal[*src]&0x80000000)
)
{
src++;
dst++;
{
src++;
dst++;
diff --git
a/lib/gui/elistboxcontent.cpp
b/lib/gui/elistboxcontent.cpp
index c874cd3616dffa29ee8a6e1368399e35912d3fdc..ff93eac2191e93c550786e429a4792655dcb30d4 100644
(file)
--- a/
lib/gui/elistboxcontent.cpp
+++ b/
lib/gui/elistboxcontent.cpp
@@
-517,7
+517,7
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
if ((num < 0) || (num >= glyphs))
int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
if ((num < 0) || (num >= glyphs))
- eWarning("glyph index %d in PythonConfigList out of bounds!");
+ eWarning("glyph index %d in PythonConfigList out of bounds!"
, num
);
else
{
para->setGlyphFlag(num, GS_INVERT);
else
{
para->setGlyphFlag(num, GS_INVERT);
@@
-713,6
+713,7
@@
void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
break;
}
break;
}
+ case TYPE_PIXMAP_ALPHATEST:
case TYPE_PIXMAP: // pixmap
{
if (!(px && py && pwidth && pheight && pfnt))
case TYPE_PIXMAP: // pixmap
{
if (!(px && py && pwidth && pheight && pfnt))
@@
-736,7
+737,7
@@
void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
r &= itemrect;
painter.clip(r);
r &= itemrect;
painter.clip(r);
- painter.blit(pixmap, r.topLeft(), r);
+ painter.blit(pixmap, r.topLeft(), r
, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0
);
painter.clippop();
break;
painter.clippop();
break;
diff --git
a/lib/gui/elistboxcontent.h
b/lib/gui/elistboxcontent.h
index a93ba512584c7aaaa59dfed18f33b4292a63224b..d3648373b0a7a520a910a414a6e4a569ef695a01 100644
(file)
--- a/
lib/gui/elistboxcontent.h
+++ b/
lib/gui/elistboxcontent.h
@@
-126,7
+126,7
@@
private:
class eListboxPythonMultiContent: public eListboxPythonStringContent
{
public:
class eListboxPythonMultiContent: public eListboxPythonStringContent
{
public:
- enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP };
+ enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP
, TYPE_PIXMAP_ALPHATEST
};
void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
void setFont(int fnt, gFont *fnt);
void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
void setFont(int fnt, gFont *fnt);
diff --git
a/lib/python/Components/TimerList.py
b/lib/python/Components/TimerList.py
index 6349466b44cfb80401efd92433a776d317170ddf..f55c9b1bf21c9c3e86a0e3d23b5e95faeeb5b105 100644
(file)
--- a/
lib/python/Components/TimerList.py
+++ b/
lib/python/Components/TimerList.py
@@
-62,7
+62,7
@@
def TimerEntryComponent(timer, processed):
if timer.disabled:
png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/redx.png"))
if timer.disabled:
png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/redx.png"))
- res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 490, 5, 40, 40, png))
+ res.append((eListboxPythonMultiContent.TYPE_PIXMAP
_ALPHATEST
, 490, 5, 40, 40, png))
return res
return res