john
/
McRogueFace
1
0
Fork 0
Code Issues 52 Pull Requests Projects 1 Releases Wiki Activity

UICollection.append, tests are good for Caption and Frame objects created by Python to be drawn by the UITestScene

This commit is contained in:
John McCardle 2023-09-09 08:49:02 -04:00
parent 1bbb0aa5b8
commit 38b6a3cade
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/UI.h
View File

@ -1032,7 +1032,32 @@ switch (target->derived_type()) \
{ {
// if not UIDrawable subclass, reject it // if not UIDrawable subclass, reject it
// self->data->push_back( c++ object inside o ); // self->data->push_back( c++ object inside o );
return NULL; // TODO
// this would be a great use case for .tp_base
if (!PyObject_IsInstance(o, (PyObject*)&PyUIFrameType) &&
//!PyObject_IsInstance(o, (PyObject*)&PyUISpriteType) &&
!PyObject_IsInstance(o, (PyObject*)&PyUICaptionType))
{
PyErr_SetString(PyExc_TypeError, "Only Frame, Caption, Sprite, and Grid objects can be added to UICollection");
return NULL;
}
if (PyObject_IsInstance(o, (PyObject*)&PyUIFrameType))
{
PyUIFrameObject* frame = (PyUIFrameObject*)o;
self->data->push_back(frame->data);
}
if (PyObject_IsInstance(o, (PyObject*)&PyUICaptionType))
{
PyUICaptionObject* caption = (PyUICaptionObject*)o;
self->data->push_back(caption->data);
}
//if (PyObject_IsInstance(o, (PyObject*)&PyUISpriteType))
//{
//}
Py_INCREF(Py_None);
return Py_None;
} }
static PyObject* PyUICollection_remove(PyUICollectionObject* self, PyObject* o) static PyObject* PyUICollection_remove(PyUICollectionObject* self, PyObject* o)