X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7e6f15005ac50206ace23e1d3496e8c6550c14f5..a9f8b624a019abc105b248885c98a71d37803e88:/lib/gui/elistboxcontent.cpp?ds=sidebyside diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 0378aefc..fd7341a9 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -147,15 +147,29 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, 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.setBackgroundColor(local_style->m_foreground_color); + 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 we have no transparent background */ if (!local_style || !local_style->m_transparent_background) { /* blit background picture, if available (otherwise, clear only) */ @@ -165,8 +179,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 +273,52 @@ 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 (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()) { @@ -268,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. @@ -397,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); } @@ -415,7 +477,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,41 +489,57 @@ 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 pforeColorSelected, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip) { if (selected && sel_clip.valid()) { - painter.clip(rc-sel_clip); - if (pbackColor) + gRegion part = rc - sel_clip; + if (!part.empty()) { - int color = PyInt_AsLong(pbackColor); - painter.setBackgroundColor(gRGB(color)); - } - else + painter.clip(part); style.setStyle(painter, eWindowStyle::styleListboxNormal); - painter.clear(); - painter.clippop(); - painter.clip(rc&sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxSelected); - if (pbackColorSelected) + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + } // transparent background? + // 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); + if (!pbackColor && local_style && local_style->m_transparent_background) + ; + else + painter.clear(); + painter.clippop(); + selected = 0; + } + part = rc & sel_clip; + if (!part.empty()) { - int color = PyInt_AsLong(pbackColorSelected); - painter.setBackgroundColor(gRGB(color)); + painter.clip(part); + 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(); + selected = 1; } - painter.clear(); - painter.clippop(); } else { @@ -473,6 +551,9 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeC 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 { @@ -481,35 +562,54 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeC { 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); + /* if we have no transparent background */ + if (!pbackColor && local_style && local_style->m_transparent_background) + ; + else + painter.clear(); } - painter.clear(); } - if (pforeColor) + if (selected) { - int color = PyInt_AsLong(pforeColor); - painter.setForegroundColor(gRGB(color)); + if (pforeColorSelected) + { + int color = PyInt_AsLong(pforeColorSelected); + 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, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); ePyObject items; @@ -546,7 +646,6 @@ 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) { @@ -575,7 +674,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_TEXT: // text { /* - (0, x, y, width, height, fnt, flags, "bla" [, color, backColor, backColorSelected, borderWidth, borderColor] ) + (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), @@ -584,7 +683,7 @@ 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)) { @@ -600,20 +699,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) : ""; int x = PyInt_AsLong(px) + offset.x(); @@ -632,11 +745,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c eRect rect(x+bwidth, y+bwidth, width-bwidth*2, height-bwidth*2); painter.clip(rect); - if (pbackColor || pbackColorSelected || pforeColor) + { gRegion rc(rect); - clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); - reset_colors=true; + clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip); } painter.setFont(m_font[fnt]); @@ -653,8 +765,6 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c int color = PyInt_AsLong(pborderColor); painter.setForegroundColor(gRGB(color)); } - else if (pforeColor) // reset to normal color - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); rect.setRect(x, y, width, bwidth); painter.fill(rect); @@ -682,7 +792,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c pwidth = PyTuple_GET_ITEM(item, 3), pheight = PyTuple_GET_ITEM(item, 4), pfilled_perc = PyTuple_GET_ITEM(item, 5), - pborderWidth, pforeColor, pbackColor, pbackColorSelected; + pborderWidth, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected; if (!(px && py && pwidth && pheight && pfilled_perc)) { @@ -691,18 +801,32 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } 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) { - pbackColor = PyTuple_GET_ITEM(item, 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 > 9) + if (size > 10) { - pbackColorSelected = PyTuple_GET_ITEM(item, 9); + pbackColorSelected = PyTuple_GET_ITEM(item, 10); if (pbackColorSelected == Py_None) pbackColorSelected=ePyObject(); } @@ -716,11 +840,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c eRect rect(x, y, width, height); painter.clip(rect); - if (pbackColor || pbackColorSelected || pforeColor) + { gRegion rc(rect); - clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); - reset_colors=true; + clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip); } // border @@ -748,7 +871,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_PIXMAP: // pixmap { /* - (2, x, y, width, height, pixmap [, foreColor, backColor, backColorSelected] ) + (2, x, y, width, height, pixmap [, backColor, backColorSelected] ) */ ePyObject px = PyTuple_GET_ITEM(item, 1), @@ -790,13 +913,12 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c eRect rect(x, y, width, height); painter.clip(rect); - if (pbackColor || pbackColorSelected) + { gRegion rc(rect); - clearRegion(painter, style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); - reset_colors=true; + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); } - + painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); painter.clippop(); break; @@ -805,8 +927,6 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c eWarning("eListboxPythonMultiContent received unknown type (%d)", type); goto error_out; } - if (reset_colors) - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); } } @@ -882,3 +1002,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(); +}