X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgui%2Felistboxcontent.cpp;h=395090648a598ea2f24e633196787e8bfd8145f1;hp=2ad6ebdeb5a34ba2bf0530d7a641d5ab71b92247;hb=612e765ceb09fce886ffc02120f039f7d880048f;hpb=335b887e2dadc805707ee929202893de6c3fa170

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 2ad6ebd..3950906 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -140,7 +140,50 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-	painter.clear();
+
+	eListboxStyle *local_style = 0;
+
+		/* get local listbox style, if present */
+	if (m_listbox)
+		local_style = m_listbox->getLocalStyle();
+
+	if (local_style)
+	{
+		if (selected)
+		{
+			/* if we have a local background color set, use that. */
+			if (local_style->m_background_color_selected_set)
+				painter.setBackgroundColor(local_style->m_background_color_selected);
+			/* same for foreground */
+			if (local_style->m_foreground_color_selected_set)
+				painter.setForegroundColor(local_style->m_foreground_color_selected);
+		}
+		else
+		{
+			/* if we have a local background color set, use that. */
+			if (local_style->m_background_color_set)
+				painter.setBackgroundColor(local_style->m_background_color);
+			/* same for foreground */
+			if (local_style->m_foreground_color_set)
+				painter.setForegroundColor(local_style->m_foreground_color);
+		}
+	}
+
+	/* if we have no transparent background */
+	if (!local_style || !local_style->m_transparent_background)
+	{
+			/* blit background picture, if available (otherwise, clear only) */
+		if (local_style && local_style->m_background)
+			painter.blit(local_style->m_background, offset, eRect(), 0);
+		else
+			painter.clear();
+	} else
+	{
+		if (local_style->m_background)
+			painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
+		else if (selected && !local_style->m_selection)
+			painter.clear();
+	}
 
 	if (m_list && cursorValid())
 	{
@@ -155,11 +198,14 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 				gray = 1;
 			item = PyTuple_GET_ITEM(item, 0);
 		}
-		
+
+		if (selected && local_style && local_style->m_selection)
+			painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST);
+
 		if (item == Py_None)
 		{
+				/* seperator */
 			int half_height = m_itemsize.height() / 2;
-			
 			painter.fill(eRect(offset.x() + half_height, offset.y() + half_height - 2, m_itemsize.width() - m_itemsize.height(), 4));
 		} else
 		{
@@ -169,11 +215,11 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 				painter.setForegroundColor(gRGB(0x808080));
 			painter.renderText(eRect(text_offset, m_itemsize), string);
 		}
-		
-		if (selected)
+
+		if (selected && (!local_style || !local_style->m_selection))
 			style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 	}
-	
+
 	painter.clippop();
 }
 
@@ -227,9 +273,52 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 	ePtr<gFont> fnt = new gFont("Regular", 20);
 	ePtr<gFont> fnt2 = new gFont("Regular", 16);
 	eRect itemrect(offset, m_itemsize);
+	eListboxStyle *local_style = 0;
+
 	painter.clip(itemrect);
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-	painter.clear();
+
+		/* get local listbox style, if present */
+	if (m_listbox)
+		local_style = m_listbox->getLocalStyle();
+
+	if (local_style)
+	{
+		if (selected)
+		{
+			/* if we have a local background color set, use that. */
+			if (local_style->m_background_color_selected_set)
+				painter.setBackgroundColor(local_style->m_background_color_selected);
+			/* same for foreground */
+			if (local_style->m_foreground_color_selected_set)
+				painter.setForegroundColor(local_style->m_foreground_color_selected);
+		}
+		else
+		{
+			/* if we have a local background color set, use that. */
+			if (local_style->m_background_color_set)
+				painter.setBackgroundColor(local_style->m_background_color);
+			/* same for foreground */
+			if (local_style->m_foreground_color_set)
+				painter.setForegroundColor(local_style->m_foreground_color);
+		}
+	}
+
+	if (!local_style || !local_style->m_transparent_background)
+		/* if we have no transparent background */
+	{
+		/* blit background picture, if available (otherwise, clear only) */
+		if (local_style && local_style->m_background)
+			painter.blit(local_style->m_background, offset, eRect(), 0);
+		else
+			painter.clear();
+	} else
+	{
+		if (local_style->m_background)
+			painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
+		else if (selected && !local_style->m_selection)
+			painter.clear();
+	}
 
 	if (m_list && cursorValid())
 	{
@@ -238,6 +327,9 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 		ePyObject text, value;
 		painter.setFont(fnt);
 
+		if (selected && local_style && local_style->m_selection)
+			painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST);
+
 			/* the first tuple element is a string for the left side.
 			   the second one will be called, and the result shall be an tuple.
 			   
@@ -367,7 +459,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 				/* value is borrowed */
 		}
 
-		if (selected)
+		if (selected && (!local_style || !local_style->m_selection))
 			style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 	}
 	
@@ -385,47 +477,137 @@ int eListboxPythonConfigContent::currentCursorSelectable()
 RESULT SwigFromPython(ePtr<gPixmap> &res, PyObject *obj);
 
 eListboxPythonMultiContent::eListboxPythonMultiContent()
-	:m_temp_clip(gRegion::invalidRegion())
+	:m_clip(gRegion::invalidRegion()), m_old_clip(gRegion::invalidRegion())
 {
 }
 
 eListboxPythonMultiContent::~eListboxPythonMultiContent()
 {
 	Py_XDECREF(m_buildFunc);
-	Py_XDECREF(m_callableFunc);
+	Py_XDECREF(m_selectableFunc);
 }
 
 void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
 {
-	if (update && m_selection_clip.valid())
+	m_selection_clip = rect;
+	if (m_listbox)
+		rect.moveBy(ePoint(0, m_listbox->getEntryTop()));
+	if (m_clip.valid())
+		m_clip |= rect;
+	else
+		m_clip = rect;
+	if (update && m_listbox)
+		m_listbox->entryChanged(m_cursor);
+}
+
+static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pforeColorSelected, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip)
+{
+	if (selected && sel_clip.valid())
 	{
-		m_temp_clip = m_selection_clip;
-		m_temp_clip |= rect;
-		m_selection_clip = rect;
-		if (m_listbox)
-			m_listbox->entryChanged(m_cursor);
+		bool clear=true;
+		painter.clip(rc-sel_clip);
+		if (pbackColor)
+		{
+			int color = PyInt_AsLong(pbackColor);
+			painter.setBackgroundColor(gRGB(color));
+		} // transparent background?
+		else if (local_style && local_style->m_transparent_background) 
+			clear=false;
+		// if we have a local background color set, use that. 
+		else if (local_style && local_style->m_background_color_set)
+			painter.setBackgroundColor(local_style->m_background_color);
+		else
+			style.setStyle(painter, eWindowStyle::styleListboxNormal);
+		if (clear)
+			painter.clear();
+		painter.clippop();
+		painter.clip(rc&sel_clip);
+		style.setStyle(painter, eWindowStyle::styleListboxSelected);
+		if (pbackColorSelected)
+		{
+			int color = PyInt_AsLong(pbackColorSelected);
+			painter.setBackgroundColor(gRGB(color));
+		}
+		else if (local_style && local_style->m_background_color_selected_set)
+			painter.setBackgroundColor(local_style->m_background_color_selected);
+		painter.clear();
+		painter.clippop();
 	}
 	else
-		m_selection_clip = rect;
+	{
+		if (selected)
+		{
+			style.setStyle(painter, eWindowStyle::styleListboxSelected);
+			if (pbackColorSelected)
+			{
+				int color = PyInt_AsLong(pbackColorSelected);
+				painter.setBackgroundColor(gRGB(color));
+			}
+			else if (local_style && local_style->m_background_color_selected_set)
+				painter.setBackgroundColor(local_style->m_background_color_selected);
+			painter.clear();
+		}
+		else
+		{
+			bool clear=true;
+			style.setStyle(painter, eWindowStyle::styleListboxNormal);
+			if (pbackColor)
+			{
+				int color = PyInt_AsLong(pbackColor);
+				painter.setBackgroundColor(gRGB(color));
+			}/* if we have a local background color set, use that. */
+			else if (local_style)
+			{
+				if (local_style->m_transparent_background)
+					clear=false;
+				else if (local_style->m_background_color_set)
+					painter.setBackgroundColor(local_style->m_background_color);
+			}
+			/* if we have no transparent background */
+			if (clear)
+				painter.clear();
+		}
+	}
+	if (selected)
+	{
+		if (pforeColorSelected)
+		{
+			int color = PyInt_AsLong(pforeColor);
+			painter.setForegroundColor(gRGB(color));
+		}
+		/* if we have a local foreground color set, use that. */
+		else if (local_style && local_style->m_foreground_color_selected_set)
+			painter.setForegroundColor(local_style->m_foreground_color_selected);
+	}
+	else
+	{
+		if (pforeColor)
+		{
+			int color = PyInt_AsLong(pforeColor);
+			painter.setForegroundColor(gRGB(color));
+		}
+		/* if we have a local foreground color set, use that. */
+		else if (local_style && local_style->m_foreground_color_set)
+			painter.setForegroundColor(local_style->m_foreground_color);
+	}
 }
 
 void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
 	gRegion itemregion(eRect(offset, m_itemsize));
-
+	eListboxStyle *local_style = 0;
 	eRect sel_clip(m_selection_clip);
 	if (sel_clip.valid())
 		sel_clip.moveBy(offset);
 
-	if (m_temp_clip.valid())
-	{
-		m_temp_clip.moveBy(offset);
-		itemregion &= m_temp_clip;
-		m_temp_clip = eRect();
-	}
+		/* get local listbox style, if present */
+	if (m_listbox)
+		local_style = m_listbox->getLocalStyle();
 
 	painter.clip(itemregion);
 
+	clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip);
+
 	ePyObject items;
 
 	if (m_list && cursorValid())
@@ -461,6 +643,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 		for (int i = 1; i < size; ++i)
 		{
 			ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference!
+			bool reset_colors=false;
 
 			if (!item)
 			{
@@ -489,7 +672,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 			case TYPE_TEXT: // text
 			{
 			/*
-				(0, x, y, width, height, fnt, flags, "bla" [, color] )
+				(0, x, y, width, height, fnt, flags, "bla" [, color, colorSelected, backColor, backColorSelected, borderWidth, borderColor] )
 			*/
 				ePyObject px = PyTuple_GET_ITEM(item, 1),
 							py = PyTuple_GET_ITEM(item, 2),
@@ -498,11 +681,11 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 							pfnt = PyTuple_GET_ITEM(item, 5),
 							pflags = PyTuple_GET_ITEM(item, 6),
 							pstring = PyTuple_GET_ITEM(item, 7),
-							pforeColor, pbackColor, pbackColorSelected, pborderWidth, pborderColor;
+							pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, pborderWidth, pborderColor;
 
 				if (!(px && py && pwidth && pheight && pfnt && pflags && pstring))
 				{
-					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string, [color, ]...])");
+					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string [, color, backColor, backColorSelected, borderWidth, borderColor])");
 					goto error_out;
 				}
 
@@ -514,20 +697,34 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				}
 				if (size > 9)
 				{
-					pbackColor = PyTuple_GET_ITEM(item, 9);
+					pforeColorSelected = PyTuple_GET_ITEM(item, 9);
+					if (pforeColorSelected == Py_None)
+						pforeColorSelected=ePyObject();
+				}
+				if (size > 10)
+				{
+					pbackColor = PyTuple_GET_ITEM(item, 10);
 					if (pbackColor == Py_None)
 						pbackColor=ePyObject();
 				}
-				if (size > 10)
+				if (size > 11)
 				{
-					pbackColorSelected = PyTuple_GET_ITEM(item, 10);
+					pbackColorSelected = PyTuple_GET_ITEM(item, 11);
 					if (pbackColorSelected == Py_None)
 						pbackColorSelected=ePyObject();
 				}
-				if (size > 11)
-					pborderWidth = PyTuple_GET_ITEM(item, 11);
 				if (size > 12)
-					pborderColor = PyTuple_GET_ITEM(item, 12);
+				{
+					pborderWidth = PyTuple_GET_ITEM(item, 12);
+					if (pborderWidth == Py_None)
+						pborderWidth=ePyObject();
+				}
+				if (size > 13)
+				{
+					pborderColor = PyTuple_GET_ITEM(item, 13);
+					if (pborderColor == Py_None)
+						pborderColor=ePyObject();
+				}
 
 				const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";
 				int x = PyInt_AsLong(px) + offset.x();
@@ -545,59 +742,12 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				}
 
 				eRect rect(x+bwidth, y+bwidth, width-bwidth*2, height-bwidth*2);
-				gRegion rc(rect);
-				rc &= itemregion;
-				painter.clip(rc);
-				itemregion -= rc;
-				if (selected && sel_clip.valid())
-				{
-					painter.clip(rc-sel_clip);
-					if (pbackColor)
-					{
-						int color = PyInt_AsLong(pbackColor);
-						painter.setBackgroundColor(gRGB(color));
-					}
-					else
-						style.setStyle(painter, eWindowStyle::styleListboxNormal);
-					painter.clear();
-					painter.clippop();
-					painter.clip(rc&sel_clip);
-					style.setStyle(painter, eWindowStyle::styleListboxSelected);
-					if (pbackColorSelected)
-					{
-						int color = PyInt_AsLong(pbackColorSelected);
-						painter.setBackgroundColor(gRGB(color));
-					}
-					painter.clear();
-					painter.clippop();
-				}
-				else
+				painter.clip(rect);
+				if (pbackColor || pbackColorSelected || pforeColor || pforeColorSelected)
 				{
-					if (selected)
-					{
-						style.setStyle(painter, eWindowStyle::styleListboxSelected);
-						if (pbackColorSelected)
-						{
-							int color = PyInt_AsLong(pbackColorSelected);
-							painter.setBackgroundColor(gRGB(color));
-						}
-					}
-					else
-					{
-						style.setStyle(painter, eWindowStyle::styleListboxNormal);
-						if (pbackColor)
-						{
-							int color = PyInt_AsLong(pbackColor);
-							painter.setBackgroundColor(gRGB(color));
-						}
-					}
-					painter.clear();
-				}
-
-				if (pforeColor)
-				{
-					int color = PyInt_AsLong(pforeColor);
-					painter.setForegroundColor(gRGB(color));
+					gRegion rc(rect);
+					clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip);
+					reset_colors=true;
 				}
 
 				painter.setFont(m_font[fnt]);
@@ -608,10 +758,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				if (bwidth)
 				{
 					eRect rect(eRect(x, y, width, height));
-					gRegion rc(rect);
-					rc &= itemregion;
-					painter.clip(rc);
-					itemregion -= rc;
+					painter.clip(rect);
 					if (pborderColor)
 					{
 						int color = PyInt_AsLong(pborderColor);
@@ -639,50 +786,68 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 			case TYPE_PROGRESS: // Progress
 			{
 			/*
-				(1, x, y, width, height, filled_percent )
+				(1, x, y, width, height, filled_percent [, borderWidth, foreColor, backColor, backColorSelected] )
 			*/
 				ePyObject px = PyTuple_GET_ITEM(item, 1),
 							py = PyTuple_GET_ITEM(item, 2),
 							pwidth = PyTuple_GET_ITEM(item, 3),
 							pheight = PyTuple_GET_ITEM(item, 4),
-							pfilled_perc = PyTuple_GET_ITEM(item, 5);
+							pfilled_perc = PyTuple_GET_ITEM(item, 5),
+							pborderWidth, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected;
 
 				if (!(px && py && pwidth && pheight && pfilled_perc))
 				{
-					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))");
+					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent [,border width, foreColor, backColor, backColorSelected]))");
 					goto error_out;
 				}
 
+				if (size > 6)
+				{
+					pborderWidth = PyTuple_GET_ITEM(item, 6);
+					if (pborderWidth == Py_None)
+						pborderWidth = ePyObject();
+				}
+				if (size > 7)
+				{
+					pforeColor = PyTuple_GET_ITEM(item, 7);
+					if (pforeColor == Py_None)
+						pforeColor = ePyObject();
+				}
+				if (size > 8)
+				{
+					pforeColorSelected = PyTuple_GET_ITEM(item, 8);
+					if (pforeColorSelected == Py_None)
+						pforeColorSelected=ePyObject();
+				}
+				if (size > 9)
+				{
+					pbackColor = PyTuple_GET_ITEM(item, 9);
+					if (pbackColor == Py_None)
+						pbackColor=ePyObject();
+				}
+				if (size > 10)
+				{
+					pbackColorSelected = PyTuple_GET_ITEM(item, 10);
+					if (pbackColorSelected == Py_None)
+						pbackColorSelected=ePyObject();
+				}
+
 				int x = PyInt_AsLong(px) + offset.x();
 				int y = PyInt_AsLong(py) + offset.y();
 				int width = PyInt_AsLong(pwidth);
 				int height = PyInt_AsLong(pheight);
 				int filled = PyInt_AsLong(pfilled_perc);
+				int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2;
 
 				eRect rect(x, y, width, height);
-				gRegion rc(rect);
-				rc &= itemregion;
-				painter.clip(rc);
-				itemregion -= rc;
-				if (selected && sel_clip.valid())
-				{
-					painter.clip(rc-sel_clip);
-					style.setStyle(painter, eWindowStyle::styleListboxNormal);
-					painter.clear();
-					painter.clippop();
-					painter.clip(rc&sel_clip);
-					style.setStyle(painter, eWindowStyle::styleListboxSelected);
-					painter.clear();
-					painter.clippop();
-				}
-				else
+				painter.clip(rect);
+				if (pbackColor || pbackColorSelected || pforeColor || pforeColorSelected)
 				{
-					style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-					painter.clear();
+					gRegion rc(rect);
+					clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip);
+					reset_colors=true;
 				}
 
-				int bwidth=2;  // borderwidth hardcoded yet
-
 				// border
 				rect.setRect(x, y, width, bwidth);
 				painter.fill(rect);
@@ -708,18 +873,19 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 			case TYPE_PIXMAP: // pixmap
 			{
 			/*
-				(2, x, y, width, height, pixmap )
+				(2, x, y, width, height, pixmap [, backColor, backColorSelected] )
 			*/
 
 				ePyObject px = PyTuple_GET_ITEM(item, 1),
 							py = PyTuple_GET_ITEM(item, 2),
 							pwidth = PyTuple_GET_ITEM(item, 3),
 							pheight = PyTuple_GET_ITEM(item, 4),
-							ppixmap = PyTuple_GET_ITEM(item, 5);
+							ppixmap = PyTuple_GET_ITEM(item, 5),
+							pbackColor, pbackColorSelected;
 
 				if (!(px && py && pwidth && pheight && ppixmap))
 				{
-					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))");
+					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, backColor, backColorSelected] ))");
 					goto error_out;
 				}
 
@@ -734,61 +900,41 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 					goto error_out;
 				}
 
-				eRect rect(x, y, width, height);
-				gRegion rc(rect);
-				rc &= itemregion;
-				painter.clip(rc);
-				itemregion -= rc;
-
-				if (selected && sel_clip.valid())
+				if (size > 6)
 				{
-					painter.clip(rc-sel_clip);
-					style.setStyle(painter, eWindowStyle::styleListboxNormal);
-					painter.clear();
-					painter.clippop();
-					painter.clip(rc&sel_clip);
-					style.setStyle(painter, eWindowStyle::styleListboxSelected);
-					painter.clear();
-					painter.clippop();
+					pbackColor = PyTuple_GET_ITEM(item, 6);
+					if (pbackColor == Py_None)
+						pbackColor=ePyObject();
 				}
-				else
+				if (size > 7)
 				{
-					style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-					painter.clear();
+					pbackColorSelected = PyTuple_GET_ITEM(item, 7);
+					if (pbackColorSelected == Py_None)
+						pbackColorSelected=ePyObject();
 				}
 
+				eRect rect(x, y, width, height);
+				painter.clip(rect);
+				if (pbackColor || pbackColorSelected)
+				{
+					gRegion rc(rect);
+					clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip);
+					reset_colors=true;
+				}
+				
 				painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0);
 				painter.clippop();
-
 				break;
 			}
 			default:
 				eWarning("eListboxPythonMultiContent received unknown type (%d)", type);
 				goto error_out;
 			}
+			if (reset_colors)
+				style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 		}
 	}
 
-	if (selected && sel_clip.valid())
-	{
-		painter.clip(itemregion-sel_clip);
-		style.setStyle(painter, eWindowStyle::styleListboxNormal);
-		painter.clear();
-		painter.clippop();
-		itemregion &= sel_clip;
-		painter.clip(itemregion);
-		style.setStyle(painter, eWindowStyle::styleListboxSelected);
-		painter.clear();
-		painter.clippop();
-	}
-	else
-	{
-		painter.clip(itemregion);
-		style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-		painter.clear();
-		painter.clippop();
-	}
-
 	if (selected)
 		style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 
@@ -806,11 +952,11 @@ void eListboxPythonMultiContent::setBuildFunc(ePyObject cb)
 	Py_XINCREF(m_buildFunc);
 }
 
-void eListboxPythonMultiContent::setCallableFunc(ePyObject cb)
+void eListboxPythonMultiContent::setSelectableFunc(ePyObject cb)
 {
-	Py_XDECREF(m_callableFunc);
-	m_callableFunc=cb;
-	Py_XINCREF(m_callableFunc);
+	Py_XDECREF(m_selectableFunc);
+	m_selectableFunc=cb;
+	Py_XINCREF(m_selectableFunc);
 }
 
 int eListboxPythonMultiContent::currentCursorSelectable()
@@ -818,15 +964,15 @@ int eListboxPythonMultiContent::currentCursorSelectable()
 	/* each list-entry is a list of tuples. if the first of these is none, it's not selectable */
 	if (m_list && cursorValid())
 	{
-		if (m_callableFunc && PyCallable_Check(m_callableFunc))
+		if (m_selectableFunc && PyCallable_Check(m_selectableFunc))
 		{
 			ePyObject args = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference!
 			if (PyTuple_Check(args))
 			{
-				ePyObject ret = PyObject_CallObject(m_callableFunc, args);
+				ePyObject ret = PyObject_CallObject(m_selectableFunc, args);
 				if (ret)
 					return ret == Py_True;
-				eDebug("call m_callableFunc failed!!! assume not callable");
+				eDebug("call m_selectableFunc failed!!! assume not callable");
 			}
 			else
 				eDebug("m_list[m_cursor] is not a tuple!!! assume not callable");
@@ -861,3 +1007,22 @@ void eListboxPythonMultiContent::setItemHeight(int height)
 	if (m_listbox)
 		m_listbox->setItemHeight(height);
 }
+
+void eListboxPythonMultiContent::setList(ePyObject list)
+{
+	m_old_clip = m_clip = gRegion::invalidRegion();
+	eListboxPythonStringContent::setList(list);
+}
+
+void eListboxPythonMultiContent::updateClip(gRegion &clip)
+{
+	if (m_clip.valid())
+	{
+		clip &= m_clip;
+		if (m_old_clip.valid() && !(m_clip-m_old_clip).empty())
+			m_clip -= m_old_clip;
+		m_old_clip = m_clip;
+	}
+	else
+		m_old_clip = m_clip = gRegion::invalidRegion();
+}