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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index c2af3d32..96214aea 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -1,159 +1,18 @@
 #include <lib/gui/elistbox.h>
-
-/*
-    The basic idea is to have an interface which gives all relevant list
-    processing functions, and can be used by the listbox to browse trough
-    the list.
-    
-    The listbox directly uses the implemented cursor. It tries hard to avoid
-    iterating trough the (possibly very large) list, so it should be O(1),
-    i.e. the performance should not be influenced by the size of the list.
-    
-    The list interface knows how to draw the current entry to a specified 
-    offset. Different interfaces can be used to adapt different lists,
-    pre-filter lists on the fly etc.
-    
-		cursorSave/Restore is used to avoid re-iterating the list on redraw.
-		The current selection is always selected as cursor position, the
-    cursor is then positioned to the start, and then iterated. This gives
-    at most 2x m_items_per_page cursor movements per redraw, indepenent
-    of the size of the list.
-    
-    Although cursorSet is provided, it should be only used when there is no
-    other way, as it involves iterating trough the list.
- */
-
-class eListboxTestContent: public virtual iListboxContent
-{
-	DECLARE_REF;
-public:
-	void cursorHome();
-	void cursorEnd();
-	int cursorMove(int count=1);
-	int cursorValid();
-	int cursorSet(int n);
-	int cursorGet();
-	
-	void cursorSave();
-	void cursorRestore();
-	int size();
-	
-	RESULT connectItemChanged(const Slot0<void> &itemChanged, ePtr<eConnection> &connection);
-	
-	// void setOutputDevice ? (for allocating colors, ...) .. requires some work, though
-	void setSize(const eSize &size);
-	
-		/* the following functions always refer to the selected item */
-	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
-private:
-	int m_cursor, m_saved_cursor;
-	eSize m_size;
-};
-
-DEFINE_REF(eListboxTestContent);
-
-void eListboxTestContent::cursorHome()
-{
-	m_cursor = 0;
-}
-
-void eListboxTestContent::cursorEnd()
-{
-	m_cursor = size();
-}
-
-int eListboxTestContent::cursorMove(int count)
-{
-	m_cursor += count;
-	
-	if (m_cursor < 0)
-		cursorHome();
-	else if (m_cursor > size())
-		cursorEnd();
-	return 0;
-}
-
-int eListboxTestContent::cursorValid()
-{
-	return m_cursor < size();
-}
-
-int eListboxTestContent::cursorSet(int n)
-{
-	m_cursor = n;
-	
-	if (m_cursor < 0)
-		cursorHome();
-	else if (m_cursor > size())
-		cursorEnd();
-	return 0;
-}
-
-int eListboxTestContent::cursorGet()
-{
-	return m_cursor;
-}
-
-void eListboxTestContent::cursorSave()
-{
-	m_saved_cursor = m_cursor;
-}
-
-void eListboxTestContent::cursorRestore()
-{
-	m_cursor = m_saved_cursor;
-}
-
-int eListboxTestContent::size()
-{
-	return 10;
-}
-	
-RESULT eListboxTestContent::connectItemChanged(const Slot0<void> &itemChanged, ePtr<eConnection> &connection)
-{
-	return 0;
-}
-
-void eListboxTestContent::setSize(const eSize &size)
-{
-	m_size = size;
-}
-
-void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-	ePtr<gFont> fnt = new gFont("Arial", 14);
-	painter.clip(eRect(offset, m_size));
-	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-	painter.clear();
-
-	if (cursorValid())
-	{
-		painter.setFont(fnt);
-		char string[10];
-		sprintf(string, "%d.)", m_cursor);
-		
-		ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-		
-		painter.renderText(eRect(text_offset, m_size), string);
-		
-		if (selected)
-			style.drawFrame(painter, eRect(offset, m_size), eWindowStyle::frameListboxEntry);
-	}
-	
-	painter.clippop();
-}
+#include <lib/gui/elistboxcontent.h>
 
 eListbox::eListbox(eWidget *parent): eWidget(parent)
 {
-	setContent(new eListboxTestContent());
-	m_content->cursorHome();
-	m_top = 0;
-	m_selected = 0;
+	setContent(new eListboxStringContent());
 }
 
 void eListbox::setContent(iListboxContent *content)
 {
 	m_content = content;
+	invalidate();
+	m_content->cursorHome();
+	m_top = 0;
+	m_selected = 0;
 }
 
 void eListbox::moveSelection(int dir)
@@ -255,7 +114,9 @@ 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!");
 }