X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b..7bc4a59528ab13f3062dc1520e76f9ecedd87400:/lib/gui/elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 1dae137f..4598fa09 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -9,6 +9,8 @@ eListbox::eListbox(eWidget *parent): eWidget(parent)
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
 	
+	m_itemheight = 20;
+	
 	ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
@@ -22,11 +24,17 @@ eListbox::~eListbox()
 void eListbox::setContent(iListboxContent *content)
 {
 	m_content = content;
+	if (content)
+		m_content->setListbox(this);
 	entryReset();
 }
 
 void eListbox::moveSelection(int dir)
 {
+		/* refuse to do anything without a valid list. */
+	if (!m_content)
+		return;
+		
 		/* we need the old top/sel to see what we have to redraw */
 	int oldtop = m_top;
 	int oldsel = m_selected;
@@ -98,8 +106,9 @@ int eListbox::event(int event, void *data, void *data2)
 	{
 		ePtr<eWindowStyle> style;
 		
+		if (!m_content)
+			return eWidget::event(event, data, data2);
 		assert(m_content);
-		recalcSize(); // move to event
 		
 		getStyle(style);
 		
@@ -121,9 +130,17 @@ int eListbox::event(int event, void *data, void *data2)
 		
 		return 0;
 	}
+	case evtChangedSize:
+		recalcSize();
+		return eWidget::event(event, data, data2);
+		
 	case evtAction:
-		moveSelection((int)data2);
-		return 1;
+		if (isVisible())
+		{
+			moveSelection((int)data2);
+			return 1;
+		}
+		return 0;
 	default:
 		return eWidget::event(event, data, data2);
 	}
@@ -131,11 +148,19 @@ int eListbox::event(int event, void *data, void *data2)
 
 void eListbox::recalcSize()
 {
-	m_itemheight = 20;
 	m_content->setSize(eSize(size().width(), m_itemheight));
 	m_items_per_page = size().height() / m_itemheight;
 }
 
+void eListbox::setItemHeight(int h)
+{
+	if (h)
+		m_itemheight = h;
+	else
+		m_itemheight = 20;
+	recalcSize();
+}
+
 void eListbox::entryAdded(int index)
 {
 		/* manage our local pointers. when the entry was added before the current position, we have to advance. */
@@ -183,9 +208,9 @@ void eListbox::entryChanged(int index)
 
 void eListbox::entryReset()
 {
-	invalidate();
 	if (m_content)
 		m_content->cursorHome();
 	m_top = 0;
 	m_selected = 0;
+	invalidate();
 }