X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cf93697fb70abeaca0eecf61873902b7f00c1da..b3faf74faa0d7539fb0b61e2ab35512c7286d23e:/lib/gui/elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 5a2613f5..8331ca11 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -153,7 +153,7 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 
 		/* same for foreground */
 	if (local_style && local_style->m_foreground_color_set)
-		painter.setBackgroundColor(local_style->m_foreground_color);
+		painter.setForegroundColor(local_style->m_foreground_color);
 
 		/* if we have no transparent background */
 	if (!local_style || !local_style->m_transparent_background)
@@ -165,8 +165,10 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 			painter.clear();
 	} else
 	{
-		if (local_style && local_style->m_background)
+		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())
@@ -272,7 +274,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 
 		/* same for foreground */
 	if (local_style && local_style->m_foreground_color_set)
-		painter.setBackgroundColor(local_style->m_foreground_color);
+		painter.setForegroundColor(local_style->m_foreground_color);
 
 	if (!local_style || !local_style->m_transparent_background)
 		/* if we have no transparent background */
@@ -284,8 +286,10 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 			painter.clear();
 	} else
 	{
-		if (local_style && local_style->m_background)
+		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())
@@ -445,7 +449,7 @@ 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())
 {
 }
 
@@ -457,42 +461,38 @@ eListboxPythonMultiContent::~eListboxPythonMultiContent()
 
 void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
 {
-	if (update && m_selection_clip.valid())
-	{
-		m_temp_clip = m_selection_clip;
-		m_temp_clip |= rect;
-		m_selection_clip = rect;
-		if (m_listbox)
-			m_listbox->entryChanged(m_cursor);
-	}
+	m_selection_clip = rect;
+	if (m_listbox)
+		rect.moveBy(ePoint(0, m_listbox->getEntryTop()));
+	if (m_clip.valid())
+		m_clip |= rect;
 	else
-		m_selection_clip = rect;
+		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 pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip)
 {
-		/* if we have a local background color set, use that. */
-	if (local_style && local_style->m_background_color_set)
-		painter.setBackgroundColor(local_style->m_background_color);
-
 	if (selected && sel_clip.valid())
 	{
-		/* if we have no transparent background */
-		if (!local_style || !local_style->m_transparent_background)
+		bool clear=true;
+		painter.clip(rc-sel_clip);
+		if (pbackColor)
 		{
-			painter.clip(rc-sel_clip);
-			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 && local_style->m_background_color_set)
-				painter.setBackgroundColor(local_style->m_background_color);
-			else
-				style.setStyle(painter, eWindowStyle::styleListboxNormal);
+			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.clippop();
 		painter.clip(rc&sel_clip);
 		style.setStyle(painter, eWindowStyle::styleListboxSelected);
 		if (pbackColorSelected)
@@ -517,16 +517,22 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
 		}
 		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 && local_style->m_background_color_set)
-				painter.setBackgroundColor(local_style->m_background_color);
+			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 (!local_style || !local_style->m_transparent_background)
+			if (clear)
 				painter.clear();
 		}
 	}
@@ -536,7 +542,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
 		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.setBackgroundColor(local_style->m_foreground_color);
+		painter.setForegroundColor(local_style->m_foreground_color);
 }
 
 void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
@@ -547,13 +553,6 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 	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();
@@ -933,3 +932,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();
+}