X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/31688e1b8f028059a700a92a8276c97928abd260..95ac56f69ddb6de8e260c8e55aff68d1df0b452c:/lib/gui/elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 96214aea..a6fe45f1 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -1,22 +1,38 @@
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
+#include <lib/actions/action.h>
 
 eListbox::eListbox(eWidget *parent): eWidget(parent)
 {
 	setContent(new eListboxStringContent());
+
+	ePtr<eActionMap> ptr;
+	eActionMap::getInstance(ptr);
+	
+	ptr->bindAction("ListboxActions", 0, 0, this);
+}
+
+eListbox::~eListbox()
+{
+	ePtr<eActionMap> ptr;
+	eActionMap::getInstance(ptr);
+	ptr->unbindAction(this, 0);
 }
 
 void eListbox::setContent(iListboxContent *content)
 {
 	m_content = content;
-	invalidate();
-	m_content->cursorHome();
-	m_top = 0;
-	m_selected = 0;
+	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;
@@ -45,6 +61,8 @@ void eListbox::moveSelection(int dir)
 		if (m_top < 0)
 			m_top = 0;
 		break;
+	case justCheck:
+		break;
 	}
 	
 		/* note that we could be on an invalid cursor position, but we don't
@@ -53,6 +71,7 @@ void eListbox::moveSelection(int dir)
 	
 		/* now, look wether the current selection is out of screen */
 	m_selected = m_content->cursorGet();
+	
 	if (m_selected < m_top)
 	{
 		m_top -= m_items_per_page;
@@ -63,11 +82,12 @@ void eListbox::moveSelection(int dir)
 			/* m_top should be always valid here as it's selected */
 		m_top += m_items_per_page;
 	}
-	
+
 	if (m_top != oldtop)
 		invalidate();
-	else
+	else if (m_selected != oldsel)
 	{
+		
 			/* 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);
@@ -84,6 +104,8 @@ 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
 		
@@ -107,6 +129,9 @@ int eListbox::event(int event, void *data, void *data2)
 		
 		return 0;
 	}
+	case evtAction:
+		moveSelection((int)data2);
+		return 1;
 	default:
 		return eWidget::event(event, data, data2);
 	}
@@ -114,9 +139,61 @@ int eListbox::event(int event, void *data, void *data2)
 
 void eListbox::recalcSize()
 {
-	eDebug("recalc size");
 	m_itemheight = 20;
 	m_content->setSize(eSize(size().width(), m_itemheight));
 	m_items_per_page = size().height() / m_itemheight;
-	eDebug("done!");
+}
+
+void eListbox::entryAdded(int index)
+{
+		/* manage our local pointers. when the entry was added before the current position, we have to advance. */
+		
+		/* we need to check <= - when the new entry has the (old) index of the cursor, the cursor was just moved down. */
+	if (index <= m_selected)
+		++m_selected;
+	if (index <= m_top)
+		++m_top;
+		
+		/* we have to check wether our current cursor is gone out of the screen. */
+		/* moveSelection will check for this case */
+	moveSelection(justCheck);
+	
+		/* now, check if the new index is visible. */
+	if ((m_top <= index) && (index < (m_top + m_items_per_page)))
+	{
+			/* todo, calc exact invalidation... */
+		invalidate();
+	}
+}
+
+void eListbox::entryRemoved(int index)
+{
+	if (index == m_selected)
+		m_selected = m_content->cursorGet();
+
+	moveSelection(justCheck);
+	
+	if ((m_top <= index) && (index < (m_top + m_items_per_page)))
+	{
+			/* todo, calc exact invalidation... */
+		invalidate();
+	}
+}
+
+void eListbox::entryChanged(int index)
+{
+	if ((m_top <= index) && (index < (m_top + m_items_per_page)))
+	{
+		gRegion inv = eRect(0, m_itemheight * (index-m_top), size().width(), m_itemheight);
+		invalidate(inv);
+	}
+}
+
+void eListbox::entryReset()
+{
+	if (m_content)
+		m_content->cursorHome();
+	m_top = 0;
+	m_selected = 0;
+	invalidate();
 }