From: Andreas Monzner Date: Fri, 9 Nov 2007 11:04:00 +0000 (+0000) Subject: dont ignore background color when transparent=1 is set.. (needed for font X-Git-Tag: 2.6.0~1746 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/29ec53f34486f08c1655b64ba95a949c1e1094af dont ignore background color when transparent=1 is set.. (needed for font anti aliasing) --- diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 39509064..9bfe81df 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -504,21 +504,20 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l { if (selected && sel_clip.valid()) { - 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) + if (local_style && local_style->m_transparent_background) + ; + else painter.clear(); painter.clippop(); painter.clip(rc&sel_clip); @@ -549,22 +548,18 @@ 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) - { - if (local_style->m_transparent_background) - clear=false; - else if (local_style->m_background_color_set) - painter.setBackgroundColor(local_style->m_background_color); - } + else if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); /* if we have no transparent background */ - if (clear) + if (local_style && local_style->m_transparent_background) + ; + else painter.clear(); } }