diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-07-31 11:00:01 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-07-31 11:00:01 +0000 |
| commit | b1d4a0b06608906144928198f66062705a8041fd (patch) | |
| tree | cd68fda9eb954ae6e4226fb250265cd036069d1b /lib/gui/elistboxcontent.cpp | |
| parent | 6db060dce242cd1990ae82f518ffa0beaee74d06 (diff) | |
| download | enigma2-b1d4a0b06608906144928198f66062705a8041fd.tar.gz enigma2-b1d4a0b06608906144928198f66062705a8041fd.zip | |
add graphical multiepg plugin (like e1)
yet it is just startable via blue button menu
Diffstat (limited to 'lib/gui/elistboxcontent.cpp')
| -rw-r--r-- | lib/gui/elistboxcontent.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 24a29512..b397ddca 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -726,11 +726,11 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c pwidth = PyTuple_GET_ITEM(item, 3), pheight = PyTuple_GET_ITEM(item, 4), ppixmap = PyTuple_GET_ITEM(item, 5), - pforeColor, pbackColor, pbackColorSelected; + pbackColor, pbackColorSelected; if (!(px && py && pwidth && pheight && ppixmap)) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, foreColor, backColor, backColorSelected] ))"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, backColor, backColorSelected] ))"); goto error_out; } @@ -747,29 +747,23 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (size > 6) { - pforeColor = PyTuple_GET_ITEM(item, 6); - if (pforeColor == Py_None) - pforeColor=ePyObject(); - } - if (size > 7) - { - pbackColor = PyTuple_GET_ITEM(item, 7); + pbackColor = PyTuple_GET_ITEM(item, 6); if (pbackColor == Py_None) pbackColor=ePyObject(); } - if (size > 8) + if (size > 7) { - pbackColorSelected = PyTuple_GET_ITEM(item, 8); + pbackColorSelected = PyTuple_GET_ITEM(item, 7); if (pbackColorSelected == Py_None) pbackColorSelected=ePyObject(); } eRect rect(x, y, width, height); painter.clip(rect); - if (pbackColor || pbackColorSelected || pforeColor) + if (pbackColor || pbackColorSelected) { gRegion rc(rect); - clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + clearRegion(painter, style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); reset_colors=true; } |
