ePtr<gFont> fnt = new gFont("Regular", 20);
painter.clip(eRect(offset, m_itemsize));
style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
- painter.clear();
+
+ eListboxStyle *local_style = 0;
+
+ /* 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 we have no transparent background */
+ if (!local_style || !local_style->m_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())
{
gray = 1;
item = PyTuple_GET_ITEM(item, 0);
}
-
+
+ if (selected && local_style && local_style->m_selection)
+ painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST);
+
if (item == Py_None)
{
+ /* seperator */
int half_height = m_itemsize.height() / 2;
-
painter.fill(eRect(offset.x() + half_height, offset.y() + half_height - 2, m_itemsize.width() - m_itemsize.height(), 4));
} else
{
painter.setForegroundColor(gRGB(0x808080));
painter.renderText(eRect(text_offset, m_itemsize), string);
}
-
- if (selected)
+
+ if (selected && (!local_style || !local_style->m_selection))
style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
}
-
+
painter.clippop();
}
int s = size();
if ( m_cursor >= s )
m_listbox->moveSelectionTo(s?s-1:0);
- m_listbox->invalidate();
+ else
+ m_listbox->invalidate();
}
}
ePtr<gFont> fnt = new gFont("Regular", 20);
ePtr<gFont> 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())
{
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.
/* value is borrowed */
}
- if (selected)
+ if (selected && (!local_style || !local_style->m_selection))
style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
}
RESULT SwigFromPython(ePtr<gPixmap> &res, PyObject *obj);
eListboxPythonMultiContent::eListboxPythonMultiContent()
- :m_temp_clip(gRegion::invalidRegion())
+ :m_clip(gRegion::invalidRegion()), m_old_clip(gRegion::invalidRegion())
{
}
eListboxPythonMultiContent::~eListboxPythonMultiContent()
{
Py_XDECREF(m_buildFunc);
- Py_XDECREF(m_callableFunc);
+ Py_XDECREF(m_selectableFunc);
}
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
{
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
{
{
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();
+ }
+ }
+ if (selected)
+ {
+ if (pforeColorSelected)
+ {
+ int color = PyInt_AsLong(pforeColorSelected);
+ painter.setForegroundColor(gRGB(color));
}
- painter.clear();
+ /* 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);
}
- if (pforeColor)
+ else
{
- int color = PyInt_AsLong(pforeColor);
- painter.setForegroundColor(gRGB(color));
+ 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;
for (int i = 1; i < size; ++i)
{
ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference!
- bool reset_colors=false;
if (!item)
{
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),
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))
{
}
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) : "<not-a-string>";
int x = PyInt_AsLong(px) + offset.x();
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]);
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);
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))
{
}
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();
}
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
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),
pwidth = PyTuple_GET_ITEM(item, 3),
pheight = PyTuple_GET_ITEM(item, 4),
ppixmap = PyTuple_GET_ITEM(item, 5),
- pforeColor, pbackColor, pbackColorSelected;
+ pbackColor, pbackColorSelected;
if (!(px && py && pwidth && pheight && ppixmap))
{
- eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, foreColor, backColor, backColorSelected] ))");
+ eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, backColor, backColorSelected] ))");
goto error_out;
}
if (size > 6)
{
- pforeColor = PyTuple_GET_ITEM(item, 6);
- if (pforeColor == Py_None)
- pforeColor=ePyObject();
- }
- if (size > 7)
- {
- pbackColor = PyTuple_GET_ITEM(item, 7);
+ pbackColor = PyTuple_GET_ITEM(item, 6);
if (pbackColor == Py_None)
pbackColor=ePyObject();
}
- if (size > 8)
+ if (size > 7)
{
- pbackColorSelected = PyTuple_GET_ITEM(item, 8);
+ pbackColorSelected = PyTuple_GET_ITEM(item, 7);
if (pbackColorSelected == Py_None)
pbackColorSelected=ePyObject();
}
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, 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;
eWarning("eListboxPythonMultiContent received unknown type (%d)", type);
goto error_out;
}
- if (reset_colors)
- style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
}
}
Py_XINCREF(m_buildFunc);
}
-void eListboxPythonMultiContent::setCallableFunc(ePyObject cb)
+void eListboxPythonMultiContent::setSelectableFunc(ePyObject cb)
{
- Py_XDECREF(m_callableFunc);
- m_callableFunc=cb;
- Py_XINCREF(m_callableFunc);
+ Py_XDECREF(m_selectableFunc);
+ m_selectableFunc=cb;
+ Py_XINCREF(m_selectableFunc);
}
int eListboxPythonMultiContent::currentCursorSelectable()
/* each list-entry is a list of tuples. if the first of these is none, it's not selectable */
if (m_list && cursorValid())
{
- if (m_callableFunc && PyCallable_Check(m_callableFunc))
+ if (m_selectableFunc && PyCallable_Check(m_selectableFunc))
{
ePyObject args = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference!
if (PyTuple_Check(args))
{
- ePyObject ret = PyObject_CallObject(m_callableFunc, args);
+ ePyObject ret = PyObject_CallObject(m_selectableFunc, args);
if (ret)
return ret == Py_True;
- eDebug("call m_callableFunc failed!!! assume not callable");
+ eDebug("call m_selectableFunc failed!!! assume not callable");
}
else
eDebug("m_list[m_cursor] is not a tuple!!! assume not callable");
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);
+}
git.cweiske.de / enigma2.git / blobdiff