X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d42c6cf196f659537b9da28049c90eccd9d7506e..b3faf74faa0d7539fb0b61e2ab35512c7286d23e:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 09b1cb5c..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()) @@ -257,9 +259,38 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, ePtr fnt = new gFont("Regular", 20); ePtr 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 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); + + /* same for foreground */ + if (local_style && 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()) { @@ -268,6 +299,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. @@ -397,7 +431,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); } @@ -415,7 +449,7 @@ int eListboxPythonConfigContent::currentCursorSelectable() RESULT SwigFromPython(ePtr &res, PyObject *obj); eListboxPythonMultiContent::eListboxPythonMultiContent() - :m_temp_clip(gRegion::invalidRegion()) + :m_clip(gRegion::invalidRegion()), m_old_clip(gRegion::invalidRegion()) { } @@ -427,31 +461,37 @@ 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, ePyObject pforeColor, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip) +static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip) { 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); - painter.clear(); + if (clear) + painter.clear(); painter.clippop(); painter.clip(rc&sel_clip); style.setStyle(painter, eWindowStyle::styleListboxSelected); @@ -473,43 +513,53 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeC int color = PyInt_AsLong(pbackColorSelected); painter.setBackgroundColor(gRGB(color)); } + 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(); } - painter.clear(); } 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, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); ePyObject items; @@ -635,7 +685,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (pbackColor || pbackColorSelected || pforeColor) { gRegion rc(rect); - clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + clearRegion(painter, style, local_style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); reset_colors=true; } @@ -719,7 +769,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (pbackColor || pbackColorSelected || pforeColor) { gRegion rc(rect); - clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + clearRegion(painter, style, local_style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); reset_colors=true; } @@ -793,7 +843,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (pbackColor || pbackColorSelected) { gRegion rc(rect); - clearRegion(painter, style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); + clearRegion(painter, style, local_style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); reset_colors=true; } @@ -882,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(); +}