X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2d9f49283b5c45221f5cc81b5f95d744b24d6a09..9b6b96172d1d20d9daf3c11bc5f0222f487d53d7:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index ff93eac2..f5ae2b38 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -374,10 +374,11 @@ void eListboxPythonStringContent::setList(PyObject *list) PyObject *eListboxPythonStringContent::getCurrentSelection() { - if (!m_list) - return 0; - if (!cursorValid()) - return 0; + if (!(m_list && cursorValid())) + { + Py_INCREF(Py_None); + return Py_None; + } PyObject *r = PyList_GET_ITEM(m_list, m_cursor); Py_XINCREF(r); return r; @@ -475,12 +476,14 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, } else if (!strcmp(atype, "slider")) { PyObject *pvalue = PyTuple_GET_ITEM(value, 1); + PyObject *psize = PyTuple_GET_ITEM(value, 2); /* convert value to Long. fallback to -1 on error. */ int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1; + int size = (pvalue && PyInt_Check(psize)) ? PyInt_AsLong(psize) : 100; /* calc. slider length */ - int width = item_right.width() * value / 100; + int width = item_right.width() * value / size; int height = item_right.height();