X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4aa7b11f525aaa22b3ad6b0d247ea67f39b498de..1681d7dadff09e071c4f79954a90969fb7815210:/lib/gui/elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index bfa09b88..f1efadfd 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -4,17 +4,14 @@
 #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());
+//	setContent(new eListboxStringContent());
 
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
-	
-	m_itemheight = 25;
-	m_selection_enabled = 1;
-	
 	ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
@@ -51,10 +48,13 @@ void eListbox::setScrollbarMode(int mode)
 
 void eListbox::setContent(iListboxContent *content)
 {
+	int oldsel = m_selected;
 	m_content = content;
 	if (content)
 		m_content->setListbox(this);
 	entryReset();
+	if (oldsel == m_selected)
+		/* emit */ selectionChanged();
 }
 
 void eListbox::moveSelection(int dir)
@@ -62,15 +62,12 @@ void eListbox::moveSelection(int dir)
 		/* refuse to do anything without a valid list. */
 	if (!m_content)
 		return;
-	
 		/* if our list does not have one entry, don't do anything. */
 	if (!m_items_per_page)
 		return;
-		
 		/* we need the old top/sel to see what we have to redraw */
 	int oldtop = m_top;
 	int oldsel = m_selected;
-	
 		/* first, move cursor */
 	switch (dir)
 	{
@@ -131,7 +128,6 @@ void eListbox::moveSelection(int dir)
 	
 		/* now, look wether the current selection is out of screen */
 	m_selected = m_content->cursorGet();
-
 	while (m_selected < m_top)
 	{
 		m_top -= m_items_per_page;
@@ -142,14 +138,16 @@ void eListbox::moveSelection(int dir)
 		/* m_top should be always valid here as it's selected */
 		m_top += m_items_per_page;
 
+	if (oldsel != m_selected)
+		/* emit */ selectionChanged();
+
 	updateScrollBar();
 
 	if (m_top != oldtop)
 		invalidate();
 	else if (m_selected != oldsel)
 	{
-		
-			/* redraw the old and newly selected */
+   /* redraw the old and newly selected */
 		gRegion inv = eRect(0, m_itemheight * (m_selected-m_top), size().width(), m_itemheight);
 		inv |= eRect(0, m_itemheight * (oldsel-m_top), size().width(), m_itemheight);
 		
@@ -281,6 +279,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);
 }