X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7f07fe05cb022af426e84846a5367f3074e6bb8e..3f8e26212c4bcca56462f09b50a681f1526e1a7c:/lib/gui/elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 09d5ec2a..cfb3d5b4 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -310,14 +310,29 @@ int eListbox::event(int event, void *data, void *data2)
 		m_content->cursorSave();
 		m_content->cursorMove(m_top - m_selected);
 		
+		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)
 		{
-			m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);
+			gRegion entry_clip_rect = paint_region & entryrect;
+
+			if (!entry_clip_rect.empty())
+				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
+				   well behaving content, so it would just
+				   degrade performance without any gain.) */
+
 			m_content->cursorMove(+1);
+			entryrect.moveBy(ePoint(0, m_itemheight));
 		}
 
+		// clear/repaint empty/unused space between scrollbar and listboxentrys
 		if (m_scrollbar && m_scrollbar->isVisible())
 		{
+			style->setStyle(painter, eWindowStyle::styleListboxNormal);
 			painter.clip(eRect(m_scrollbar->position() - ePoint(5,0), eSize(5,m_scrollbar->size().height())));
 			painter.clear();
 			painter.clippop();
@@ -327,6 +342,7 @@ int eListbox::event(int event, void *data, void *data2)
 
 		return 0;
 	}
+
 	case evtChangedSize:
 		recalcSize();
 		return eWidget::event(event, data, data2);