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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index b7b1e3ff..c13114e8 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -54,16 +54,10 @@ void eListbox::setWrapAround(bool state)
 
 void eListbox::setContent(iListboxContent *content)
 {
-	int oldsel = m_selected;
 	m_content = content;
 	if (content)
 		m_content->setListbox(this);
 	entryReset();
-			/* if oldsel != m_selected, selectionChanged was already 
-			   emitted in entryReset. we want it in any case, so otherwise,
-			   emit it now. */
-	if (oldsel == m_selected)
-		/* emit */ selectionChanged();
 }
 
 bool eListbox::atBegin()
@@ -99,7 +93,7 @@ void eListbox::moveToEnd()
 	}
 }
 
-void eListbox::moveSelection(int dir)
+void eListbox::moveSelection(long dir)
 {
 		/* refuse to do anything without a valid list. */
 	if (!m_content)
@@ -226,7 +220,6 @@ void eListbox::moveSelection(int dir)
    /* 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);
-		
 		invalidate(inv);
 	}
 }
@@ -286,7 +279,7 @@ void eListbox::updateScrollBar()
 			if ((pages*m_items_per_page) < entries)
 				++pages;
 			int start=(m_top*100)/(pages*m_items_per_page);
-			int vis=(m_items_per_page*100)/(pages*m_items_per_page);
+			int vis=(m_items_per_page*100+pages*m_items_per_page-1)/(pages*m_items_per_page);
 			if (vis < 3)
 				vis=3;
 			m_scrollbar->setStartEnd(start,start+vis);
@@ -294,6 +287,11 @@ void eListbox::updateScrollBar()
 	}
 }
 
+int eListbox::getEntryTop()
+{
+	return (m_selected - m_top) * m_itemheight;
+}
+
 int eListbox::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -304,7 +302,7 @@ int eListbox::event(int event, void *data, void *data2)
 		
 		if (!m_content)
 			return eWidget::event(event, data, data2);
-		assert(m_content);
+		ASSERT(m_content);
 		
 		getStyle(style);
 		
@@ -318,7 +316,7 @@ int eListbox::event(int event, void *data, void *data2)
 		
 		gRegion entryrect = eRect(0, 0, size().width(), m_itemheight);
 		const gRegion &paint_region = *(gRegion*)data;
-		
+
 		for (int y = 0, i = 0; i <= m_items_per_page; y += m_itemheight, ++i)
 		{
 			gRegion entry_clip_rect = paint_region & entryrect;
@@ -327,7 +325,7 @@ int eListbox::event(int event, void *data, void *data2)
 				m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);
 
 				/* (we could clip with entry_clip_rect, but 
-				   this shouldn't change the behaviour of any
+				   this shouldn't change the behavior of any
 				   well behaving content, so it would just
 				   degrade performance without any gain.) */
 
@@ -356,7 +354,7 @@ int eListbox::event(int event, void *data, void *data2)
 	case evtAction:
 		if (isVisible())
 		{
-			moveSelection((int)data2);
+			moveSelection((long)data2);
 			return 1;
 		}
 		return 0;
@@ -428,7 +426,10 @@ void eListbox::entryRemoved(int index)
 	if (index == m_selected && m_content)
 		m_selected = m_content->cursorGet();
 
-	moveSelection(justCheck);
+	if (m_content && m_content->cursorGet() >= m_content->size())
+		moveSelection(moveUp);
+	else
+		moveSelection(justCheck);
 
 	if ((m_top <= index) && (index < (m_top + m_items_per_page)))
 	{
@@ -450,6 +451,7 @@ void eListbox::entryReset(bool selectionHome)
 {
 	m_content_changed = true;
 	m_prev_scrollbar_page = -1;
+	int oldsel;
 
 	if (selectionHome)
 	{
@@ -466,10 +468,15 @@ void eListbox::entryReset(bool selectionHome)
 		else
 			m_selected = 0;
 		m_content->cursorSet(m_selected);
-		selectionChanged();
 	}
 	
+	oldsel = m_selected;
 	moveSelection(justCheck);
+		/* if oldsel != m_selected, selectionChanged was already 
+		   emitted in moveSelection. we want it in any case, so otherwise,
+		   emit it now. */
+	if (oldsel == m_selected)
+		/* emit */ selectionChanged();
 	invalidate();
 }
 
@@ -479,12 +486,24 @@ void eListbox::setBackgroundColor(gRGB &col)
 	m_style.m_background_color_set = 1;
 }
 
+void eListbox::setBackgroundColorSelected(gRGB &col)
+{
+	m_style.m_background_color_selected = col;
+	m_style.m_background_color_selected_set = 1;
+}
+
 void eListbox::setForegroundColor(gRGB &col)
 {
 	m_style.m_foreground_color = col;
 	m_style.m_foreground_color_set = 1;
 }
 
+void eListbox::setForegroundColorSelected(gRGB &col)
+{
+	m_style.m_foreground_color_selected = col;
+	m_style.m_foreground_color_selected_set = 1;
+}
+
 void eListbox::setBackgroundPicture(ePtr<gPixmap> &pm)
 {
 	m_style.m_background = pm;
@@ -495,6 +514,14 @@ void eListbox::setSelectionPicture(ePtr<gPixmap> &pm)
 	m_style.m_selection = pm;
 }
 
+void eListbox::invalidate(const gRegion &region)
+{
+	gRegion tmp(region);
+	if (m_content)
+		m_content->updateClip(tmp);
+	eWidget::invalidate(tmp);
+}
+
 struct eListboxStyle *eListbox::getLocalStyle(void)
 {
 		/* transparency is set directly in the widget */