X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cf93697fb70abeaca0eecf61873902b7f00c1da..87b1a41106c4561a400536558d10dc703b3f81f4:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 5a2613f5..585d6fec 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()) @@ -246,7 +262,8 @@ void eListboxPythonStringContent::invalidate() int s = size(); if ( m_cursor >= s ) m_listbox->moveSelectionTo(s?s-1:0); - m_listbox->invalidate(); + else + m_listbox->invalidate(); } } @@ -266,13 +283,27 @@ void eListboxPythonConfigContent::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 (!local_style || !local_style->m_transparent_background) /* if we have no transparent background */ @@ -284,8 +315,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()) @@ -398,6 +431,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (plist && PyList_Check(plist)) entries = PyList_Size(plist); + int left=0, right=0, last=-1; + eRect bbox; for (int i = 0; i < entries; ++i) { ePyObject entry = PyList_GET_ITEM(plist, i); @@ -407,15 +442,23 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, eWarning("glyph index %d in PythonConfigList out of bounds!", num); else { + if (last+1 != num && last != -1) { + bbox = eRect(left, offset.y(), right-left, m_itemsize.height()); + painter.fill(bbox); + } para->setGlyphFlag(num, GS_INVERT); - eRect bbox; bbox = para->getGlyphBBox(num); - bbox = eRect(bbox.left(), offset.y(), bbox.width(), m_itemsize.height()); - painter.fill(bbox); + if (last+1 != num || last == -1) + left = bbox.left(); + right = bbox.left() + bbox.width(); + last = num; } /* entry is borrowed */ } - + if (last != -1) { + bbox = eRect(left, offset.y(), right-left, m_itemsize.height()); + painter.fill(bbox); + } painter.renderPara(para, ePoint(0, 0)); /* pvalue is borrowed */ /* plist is 0 or borrowed */ @@ -445,7 +488,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()) { } @@ -457,51 +500,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, eListboxStyle *local_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 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) + gRegion part = rc - sel_clip; + if (!part.empty()) { - painter.clip(rc-sel_clip); + painter.clip(part); + 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. */ + } // 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 - style.setStyle(painter, eWindowStyle::styleListboxNormal); - painter.clear(); + painter.clear(); painter.clippop(); + selected = 0; } - painter.clip(rc&sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxSelected); - if (pbackColorSelected) + 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 { @@ -513,6 +562,8 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l 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 @@ -526,17 +577,34 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l else if (local_style && 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 (!pbackColor && local_style && local_style->m_transparent_background) + ; + else painter.clear(); } } - if (pforeColor) + if (selected) { - 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.setBackgroundColor(local_style->m_foreground_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) @@ -547,20 +615,12 @@ 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(); painter.clip(itemregion); - - clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); ePyObject items; @@ -597,7 +657,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) { @@ -626,7 +685,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), @@ -635,7 +694,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)) { @@ -651,20 +710,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(); @@ -683,11 +756,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, local_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]); @@ -704,8 +776,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); @@ -733,7 +803,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)) { @@ -742,18 +812,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(); } @@ -767,11 +851,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, local_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 @@ -841,13 +924,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, local_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; @@ -856,8 +938,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); } } @@ -933,3 +1013,28 @@ 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(); +} + +void eListboxPythonMultiContent::entryRemoved(int idx) +{ + if (m_listbox) + m_listbox->entryRemoved(idx); +}