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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 4598fa09..dc735f85 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -9,7 +9,7 @@ eListbox::eListbox(eWidget *parent): eWidget(parent)
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
 	
-	m_itemheight = 20;
+	m_itemheight = 25;
 	
 	ptr->bindAction("ListboxActions", 0, 0, this);
 }
@@ -51,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;
@@ -122,7 +144,7 @@ int eListbox::event(int event, void *data, void *data2)
 		
 		for (int y = 0, i = 0; i < m_items_per_page; y += m_itemheight, ++i)
 		{
-			m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet());
+			m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size());
 			m_content->cursorMove(+1);
 		}