add possibility to redefine multiepg colors in skin

[enigma2.git] / lib / gui / elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 24a2951242807d94bf377a8f698b5d736c5b958e..09b1cb5cdd5f3cebea4ddb0b9110f1d173cfdf4e 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -140,7 +140,34 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
        ePtr<gFont> fnt = new gFont("Regular", 20);
        painter.clip(eRect(offset, m_itemsize));
        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-       painter.clear();
+
+       eListboxStyle *local_style = 0;
+
+               /* get local listbox style, if present */
+       if (m_listbox)
+               local_style = m_listbox->getLocalStyle();
+
+               /* if we have a local background color set, use that. */
+       if (local_style && local_style->m_background_color_set)
+               painter.setBackgroundColor(local_style->m_background_color);
+
+               /* same for foreground */
+       if (local_style && local_style->m_foreground_color_set)
+               painter.setBackgroundColor(local_style->m_foreground_color);
+
+               /* if we have no transparent background */
+       if (!local_style || !local_style->m_transparent_background)
+       {
+                       /* blit background picture, if available (otherwise, clear only) */
+               if (local_style && local_style->m_background)
+                       painter.blit(local_style->m_background, offset, eRect(), 0);
+               else
+                       painter.clear();
+       } else
+       {
+               if (local_style && local_style->m_background)
+                       painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
+       }
 
        if (m_list && cursorValid())
        {
@@ -155,11 +182,14 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
                                gray = 1;
                        item = PyTuple_GET_ITEM(item, 0);
                }
-               
+
+               if (selected && local_style && local_style->m_selection)
+                       painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST);
+
                if (item == Py_None)
                {
+                               /* seperator */
                        int half_height = m_itemsize.height() / 2;
-                       
                        painter.fill(eRect(offset.x() + half_height, offset.y() + half_height - 2, m_itemsize.width() - m_itemsize.height(), 4));
                } else
                {
@@ -169,11 +199,11 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
                                painter.setForegroundColor(gRGB(0x808080));
                        painter.renderText(eRect(text_offset, m_itemsize), string);
                }
-               
-               if (selected)
+
+               if (selected && (!local_style || !local_style->m_selection))
                        style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
        }
-       
+
        painter.clippop();
 }
 
@@ -718,7 +748,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                        case TYPE_PIXMAP: // pixmap
                        {
                        /*
-                               (2, x, y, width, height, pixmap [, foreColor, backColor, backColorSelected] )
+                               (2, x, y, width, height, pixmap [, backColor, backColorSelected] )
                        */
 
                                ePyObject px = PyTuple_GET_ITEM(item, 1),
@@ -726,11 +756,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 +777,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;
                                }