eSize item_left = eSize(m_seperation, m_itemsize.height());
eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height());
painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT);
-// Py_XDECREF(text);
+ Py_XDECREF(text);
+
+ /* when we have no label, align value to the left. (FIXME:
+ don't we want to specifiy this individually?) */
+ int value_alignment_left = !*string;
/* now, handle the value. get 2nd part from tuple*/
value = PyTuple_GET_ITEM(item, 1);
PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
painter.setFont(fnt2);
- painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT);
+ if (value_alignment_left)
+ painter.renderText(eRect(offset, item_right), value, gPainter::RT_HALIGN_LEFT);
+ else
+ painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT);
/* pvalue is borrowed */
} else if (!strcmp(atype, "slider"))
{
PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
-
- ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right));
+ int xoffs = value_alignment_left ? 0 : m_seperation;
+ ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(xoffs, 0), item_right));
para->setFont(fnt2);
para->renderString(text, 0);
- para->realign(eTextPara::dirRight);
+ para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight);
int glyphs = para->size();
PyObject *plist = 0;
int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
if ((num < 0) || (num >= glyphs))
- eWarning("glyph index %d in PythonConfigList out of bounds!");
+ eWarning("glyph index %d in PythonConfigList out of bounds!", num);
else
{
para->setGlyphFlag(num, GS_INVERT);
break;
}
+ case TYPE_PIXMAP_ALPHATEST:
case TYPE_PIXMAP: // pixmap
{
if (!(px && py && pwidth && pheight && pfnt))
r &= itemrect;
painter.clip(r);
- painter.blit(pixmap, r.topLeft(), r);
+ painter.blit(pixmap, r.topLeft(), r, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0);
painter.clippop();
break;