X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b682e464035635927e72142065f0332d58ea8fcb..91eaa14c3fa4ca9596b91d1754976108f3882717:/lib/gui/elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index ccd13ff4..a5d18e6b 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -4,22 +4,22 @@
 #include <lib/actions/action.h>
 
 eListbox::eListbox(eWidget *parent)
-	:eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false)
-	, m_scrollbar_mode(showNever), m_scrollbar(NULL)
+	:eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1)
+	,m_content_changed(false), m_top(0), m_selected(0), m_itemheight(25)
+	,m_items_per_page(0), m_selection_enabled(1), m_scrollbar(NULL)
 {
 	setContent(new eListboxStringContent());
 
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
-	
-	m_itemheight = 25;
-	m_selection_enabled = 1;
-	
 	ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
 eListbox::~eListbox()
 {
+	if (m_scrollbar)
+		delete m_scrollbar;
+	
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
 	ptr->unbindAction(this, 0);
@@ -156,9 +156,19 @@ void eListbox::moveSelection(int dir)
 
 void eListbox::moveSelectionTo(int index)
 {
-	m_content->cursorHome();
-	m_content->cursorMove(index);
-	moveSelection(justCheck);
+	if ( m_content )
+	{
+		m_content->cursorHome();
+		m_content->cursorMove(index);
+		moveSelection(justCheck);
+	}
+}
+
+int eListbox::getCurrentIndex()
+{
+	if ( m_content && m_content->cursorValid() )
+		return m_content->cursorGet();
+	return 0;
 }
 
 void eListbox::updateScrollBar()
@@ -268,6 +278,10 @@ void eListbox::recalcSize()
 	m_prev_scrollbar_page=-1;
 	m_content->setSize(eSize(size().width(), m_itemheight));
 	m_items_per_page = size().height() / m_itemheight;
+
+	if (m_items_per_page < 0) /* TODO: whyever - our size could be invalid, or itemheigh could be wrongly specified. */
+ 		m_items_per_page = 0;
+
 	moveSelection(justCheck);
 }
 
@@ -333,14 +347,17 @@ void eListbox::entryChanged(int index)
 	}
 }
 
-void eListbox::entryReset()
+void eListbox::entryReset(bool cursorHome)
 {
 	m_content_changed=true;
 	m_prev_scrollbar_page=-1;
-	if (m_content)
-		m_content->cursorHome();
-	m_top = 0;
-	m_selected = 0;
+	if ( cursorHome )
+	{
+		if (m_content)
+			m_content->cursorHome();
+		m_top = 0;
+		m_selected = 0;
+	}
 	moveSelection(justCheck);
 	invalidate();
 }