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 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 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 && local_style->m_background)
+ painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
+ }
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();
}
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 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 && local_style->m_background)
+ painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
+ }
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())
{
}
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);
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;
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;
}
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;
}
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)
+ if (pbackColor || pbackColorSelected)
{
gRegion rc(rect);
- clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip);
+ clearRegion(painter, style, local_style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip);
reset_colors=true;
}
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();
+}