Merge commit 'origin/master' into tmbinc/FixTimingBugs

[vuplus_dvbapp] / lib / gui / elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 69f72a4..bf183f9 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -523,7 +523,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxNormal);
                        if (pbackColor)
                        {
-                               int color = PyInt_AsLong(pbackColor);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColor);
                                painter.setBackgroundColor(gRGB(color));
                        } // transparent background?
                        // if we have a local background color set, use that. 
@@ -543,7 +543,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxSelected);
                        if (pbackColorSelected)
                        {
-                               int color = PyInt_AsLong(pbackColorSelected);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected);
                                painter.setBackgroundColor(gRGB(color));
                        }
                        else if (local_style && local_style->m_background_color_selected_set)
@@ -560,7 +560,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxSelected);
                        if (pbackColorSelected)
                        {
-                               int color = PyInt_AsLong(pbackColorSelected);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected);
                                painter.setBackgroundColor(gRGB(color));
                        }
                        else if (local_style && local_style->m_background_color_selected_set)
@@ -572,7 +572,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxNormal);
                        if (pbackColor)
                        {
-                               int color = PyInt_AsLong(pbackColor);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColor);
                                painter.setBackgroundColor(gRGB(color));
                        }/* if we have a local background color set, use that. */
                        else if (local_style && local_style->m_background_color_set)
@@ -588,7 +588,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
        {
                if (pforeColorSelected)
                {
-                       int color = PyInt_AsLong(pforeColorSelected);
+                       unsigned int color = PyInt_AsUnsignedLongMask(pforeColorSelected);
                        painter.setForegroundColor(gRGB(color));
                }
                /* if we have a local foreground color set, use that. */
@@ -599,7 +599,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
        {
                if (pforeColor)
                {
-                       int color = PyInt_AsLong(pforeColor);
+                       unsigned int color = PyInt_AsUnsignedLongMask(pforeColor);
                        painter.setForegroundColor(gRGB(color));
                }
                /* if we have a local foreground color set, use that. */
@@ -608,6 +608,30 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
        }
 }
 
+static ePyObject lookupColor(ePyObject color, ePyObject data)
+{
+       if (color == Py_None)
+               return ePyObject();
+
+       if ((!color) && (!data))
+               return color;
+
+       unsigned int icolor = PyInt_AsUnsignedLongMask(color);
+
+               /* check if we have the "magic" template color */
+       if ((icolor & 0xFF000000) == 0xFF000000)
+       {
+               int index = icolor & 0xFFFFFF;
+               eDebug("[eListboxPythonMultiContent] template color index: %d", index);
+               return PyTuple_GetItem(data, index);
+       }
+
+       if (color == Py_None)
+               return ePyObject();
+
+       return color;
+}
+
 void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
        gRegion itemregion(eRect(offset, m_itemsize));
@@ -732,29 +756,17 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                }
 
                                if (size > 8)
-                               {
-                                       pforeColor = PyTuple_GET_ITEM(item, 8);
-                                       if (pforeColor == Py_None)
-                                               pforeColor=ePyObject();
-                               }
+                                       pforeColor = lookupColor(PyTuple_GET_ITEM(item, 8), data);
+
                                if (size > 9)
-                               {
-                                       pforeColorSelected = PyTuple_GET_ITEM(item, 9);
-                                       if (pforeColorSelected == Py_None)
-                                               pforeColorSelected=ePyObject();
-                               }
+                                       pforeColorSelected = lookupColor(PyTuple_GET_ITEM(item, 9), data);
+
                                if (size > 10)
-                               {
-                                       pbackColor = PyTuple_GET_ITEM(item, 10);
-                                       if (pbackColor == Py_None)
-                                               pbackColor=ePyObject();
-                               }
+                                       pbackColor = lookupColor(PyTuple_GET_ITEM(item, 10), data);
+
                                if (size > 11)
-                               {
-                                       pbackColorSelected = PyTuple_GET_ITEM(item, 11);
-                                       if (pbackColorSelected == Py_None)
-                                               pbackColorSelected=ePyObject();
-                               }
+                                       pbackColorSelected = lookupColor(PyTuple_GET_ITEM(item, 11), data);
+
                                if (size > 12)
                                {
                                        pborderWidth = PyTuple_GET_ITEM(item, 12);
@@ -762,15 +774,15 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                                pborderWidth=ePyObject();
                                }
                                if (size > 13)
-                               {
-                                       pborderColor = PyTuple_GET_ITEM(item, 13);
-                                       if (pborderColor == Py_None)
-                                               pborderColor=ePyObject();
-                               }
+                                       pborderColor = lookupColor(PyTuple_GET_ITEM(item, 13), data);
 
                                if (PyInt_Check(pstring) && data) /* if the string is in fact a number, it refers to the 'data' list. */
                                        pstring = PyTuple_GetItem(data, PyInt_AsLong(pstring));
 
+                                                       /* don't do anything if we have 'None' as string */
+                               if (pstring == Py_None)
+                                       continue;
+
                                const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
@@ -805,7 +817,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                        painter.clip(rect);
                                        if (pborderColor)
                                        {
-                                               int color = PyInt_AsLong(pborderColor);
+                                               unsigned int color = PyInt_AsUnsignedLongMask(pborderColor);
                                                painter.setForegroundColor(gRGB(color));
                                        }
 
@@ -937,6 +949,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                if (PyInt_Check(ppixmap) && data) /* if the pixemap is in fact a number, it refers to the 'data' list. */
                                        ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap));
 
+                                                       /* don't do anything if we have 'None' as pixmap */
+                               if (ppixmap == Py_None)
+                                       continue;
+
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
                                int width = PyInt_AsLong(pwidth);
@@ -949,17 +965,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                }
 
                                if (size > 6)
-                               {
-                                       pbackColor = PyTuple_GET_ITEM(item, 6);
-                                       if (pbackColor == Py_None)
-                                               pbackColor=ePyObject();
-                               }
+                                       pbackColor = lookupColor(PyTuple_GET_ITEM(item, 6), data);
+
                                if (size > 7)
-                               {
-                                       pbackColorSelected = PyTuple_GET_ITEM(item, 7);
-                                       if (pbackColorSelected == Py_None)
-                                               pbackColorSelected=ePyObject();
-                               }
+                                       pbackColorSelected = lookupColor(PyTuple_GET_ITEM(item, 7), data);
 
                                eRect rect(x, y, width, height);
                                painter.clip(rect);