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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 1dae137f..4f799a17 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;
@@ -43,17 +51,39 @@ void eListbox::moveSelection(int dir)
 		if (!m_content->cursorValid())
 			m_content->cursorMove(-1);
 		break;
+	case pageUp:
+		if (m_content->cursorGet() >= m_items_per_page)
+		{
+			m_content->cursorMove(-m_items_per_page);
+			m_top -= m_items_per_page;
+			if (m_top < 0)
+				m_top = 0;
+		} else
+		{
+			m_top = 0;
+			m_content->cursorHome();
+		}
+		break;
 	case moveTop:
 		m_content->cursorHome();
 		m_top = 0; /* align with top, speeds up process */
 		break;
+
+	case pageDown:
+		m_content->cursorMove(m_items_per_page);
+		if (m_content->cursorValid())
+			break;
+				/* fall through */
 	case moveEnd:
 			/* move to last existing one ("end" is already invalid) */
 		m_content->cursorEnd(); m_content->cursorMove(-1); 
-		
-		m_top = m_content->cursorGet() - m_items_per_page + 1;
-		if (m_top < 0)
-			m_top = 0;
+			/* current selection invisible? */
+		if (m_top + m_items_per_page <= m_content->cursorGet())
+		{
+			m_top = m_content->cursorGet() - m_items_per_page + 1;
+			if (m_top < 0)
+				m_top = 0;
+		}
 		break;
 	case justCheck:
 		break;
@@ -98,8 +128,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 +152,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 +170,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 +230,9 @@ void eListbox::entryChanged(int index)
 
 void eListbox::entryReset()
 {
-	invalidate();
 	if (m_content)
 		m_content->cursorHome();
 	m_top = 0;
 	m_selected = 0;
+	invalidate();
 }