aboutsummaryrefslogtreecommitdiff
path: root/lib/gui
diff options
context:
space:
mode:
authorFelix Domke <felix.domke@multimedia-labs.de>2009-07-16 23:39:16 +0200
committerFelix Domke <felix.domke@multimedia-labs.de>2009-07-16 23:39:30 +0200
commit264dadf9ecebe4b79648d971f3f8d9f1555f2447 (patch)
treeb70bdd82aa2a3cc62b0b6534ca6ecc0efbb0bbef /lib/gui
parente02c9fd73f0043ed1f57ec448a5a2c8765f55ae1 (diff)
downloadenigma2-264dadf9ecebe4b79648d971f3f8d9f1555f2447.tar.gz
enigma2-264dadf9ecebe4b79648d971f3f8d9f1555f2447.zip
allow use of alphablended pixmaps in multicontent lists
Diffstat (limited to 'lib/gui')
-rw-r--r--lib/gui/elistboxcontent.cpp3
-rw-r--r--lib/gui/elistboxcontent.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index e05da215..4b4b58c1 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -945,6 +945,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
break;
}
+ case TYPE_PIXMAP_ALPHABLEND:
case TYPE_PIXMAP_ALPHATEST:
case TYPE_PIXMAP: // pixmap
{
@@ -997,7 +998,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid);
}
- painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0);
+ painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : (type == TYPE_PIXMAP_ALPHABLEND) ? gPainter::BT_ALPHABLEND : 0);
painter.clippop();
break;
}
diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index 6bb45590..d3d2a089 100644
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -69,7 +69,7 @@ class eListboxPythonMultiContent: public eListboxPythonStringContent
public:
eListboxPythonMultiContent();
~eListboxPythonMultiContent();
- enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP, TYPE_PIXMAP_ALPHATEST };
+ enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP, TYPE_PIXMAP_ALPHATEST, TYPE_PIXMAP_ALPHABLEND };
void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
int currentCursorSelectable();
void setList(SWIG_PYOBJECT(ePyObject) list);