git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show event information of current selected event in channelselection
[enigma2.git]
/
lib
/
gui
/
elistboxcontent.cpp
diff --git
a/lib/gui/elistboxcontent.cpp
b/lib/gui/elistboxcontent.cpp
index d4272a0aac08ba7c1d812debf31a1aad43c8a6b2..4fa5a65ed2f2233ae2e350a6e9845b7912fdf6d8 100644
(file)
--- a/
lib/gui/elistboxcontent.cpp
+++ b/
lib/gui/elistboxcontent.cpp
@@
-37,6
+37,7
@@
iListboxContent::iListboxContent(): m_listbox(0)
void iListboxContent::setListbox(eListbox *lb)
{
m_listbox = lb;
void iListboxContent::setListbox(eListbox *lb)
{
m_listbox = lb;
+ m_listbox->setItemHeight(getItemHeight());
}
int iListboxContent::currentCursorSelectable()
}
int iListboxContent::currentCursorSelectable()
@@
-48,7
+49,7
@@
int iListboxContent::currentCursorSelectable()
DEFINE_REF(eListboxPythonStringContent);
DEFINE_REF(eListboxPythonStringContent);
-eListboxPythonStringContent::eListboxPythonStringContent()
+eListboxPythonStringContent::eListboxPythonStringContent()
: m_itemheight(25)
{
}
{
}
@@
-195,10
+196,8
@@
void eListboxPythonStringContent::setList(ePyObject list)
PyObject *eListboxPythonStringContent::getCurrentSelection()
{
if (!(m_list && cursorValid()))
PyObject *eListboxPythonStringContent::getCurrentSelection()
{
if (!(m_list && cursorValid()))
- {
- Py_INCREF(Py_None);
- return Py_None;
- }
+ Py_RETURN_NONE;
+
ePyObject r = PyList_GET_ITEM(m_list, m_cursor);
Py_XINCREF(r);
return r;
ePyObject r = PyList_GET_ITEM(m_list, m_cursor);
Py_XINCREF(r);
return r;
@@
-663,3
+662,10
@@
void eListboxPythonMultiContent::setFont(int fnt, gFont *font)
else
m_font.erase(fnt);
}
else
m_font.erase(fnt);
}
+
+void eListboxPythonMultiContent::setItemHeight(int height)
+{
+ m_itemheight = height;
+ if (m_listbox)
+ m_listbox->setItemHeight(height);
+}