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

Send Menu color to Python

This commit is contained in:
John McCardle 2023-03-02 05:53:17 -05:00
parent f23dfbe4ba
commit a1e9129923
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/McRFPy_API.cpp
View File

@ -206,8 +206,12 @@ PyObject* McRFPy_API::_listMenus(PyObject*, PyObject*) {
for (int i = 0; i < menus.size(); i++) { for (int i = 0; i < menus.size(); i++) {
auto p = menus[i].box.getPosition(); auto p = menus[i].box.getPosition();
auto s = menus[i].box.getSize(); auto s = menus[i].box.getSize();
PyObject* menu_args = Py_BuildValue("(iiii)", p.x, p.y, s.x, s.y); auto g = menus[i].box.getFillColor();
// * need uimenu_type (imported already to __main__) PyObject* menu_args = Py_BuildValue("(iiii(iii)O)",
(int)p.x, (int)p.y, (int)s.x, (int)s.y,
(int)g.r, (int)g.g, (int)g.b,
menus[i].visible ? Py_True: Py_False);
menus[i].visible ? Py_INCREF(Py_True) : Py_INCREF(Py_False);
PyObject* menuobj = PyObject_CallObject((PyObject*) uimenu_type, menu_args); PyObject* menuobj = PyObject_CallObject((PyObject*) uimenu_type, menu_args);
// Loop: Convert Button objects to Python Objects // Loop: Convert Button objects to Python Objects
@ -218,12 +222,11 @@ PyObject* McRFPy_API::_listMenus(PyObject*, PyObject*) {
auto bg = b.rect.getFillColor(); auto bg = b.rect.getFillColor();
auto bf = b.caption.getFillColor(); auto bf = b.caption.getFillColor();
PyObject* btn_args = Py_BuildValue("(iiii(iii)(iii)ss)", PyObject* btn_args = Py_BuildValue("(iiii(iii)(iii)ss)",
bp.x, bp.y, bs.x, bs.y, (int)bp.x, (int)bp.y, (int)bs.x, (int)bs.y,
bg.r, bg.g, bg.b, (int)bg.r, (int)bg.g, (int)bg.b,
bf.r, bf.g, bf.b, (int)bf.r, (int)bf.g, (int)bf.b,
b.caption.getString().toAnsiString().c_str(), b.caption.getString().toAnsiString().c_str(),
b.action.c_str()); b.action.c_str());
// * need btn_type
PyObject* buttonobj = PyObject_CallObject((PyObject*) btn_type, btn_args); PyObject* buttonobj = PyObject_CallObject((PyObject*) btn_type, btn_args);
PyList_Append(button_list, buttonobj); PyList_Append(button_list, buttonobj);
} }
@ -243,7 +246,7 @@ PyObject* McRFPy_API::_listMenus(PyObject*, PyObject*) {
// Loop: Convert Sprite objects to Python Objects // Loop: Convert Sprite objects to Python Objects
PyObject* sprite_list = PyObject_GetAttrString(menuobj, "sprites"); PyObject* sprite_list = PyObject_GetAttrString(menuobj, "sprites");
for (auto& s : menus[i].sprites) { for (auto& s : menus[i].sprites) {
PyObject* spr_args = Py_BuildValue("iiii", PyObject* spr_args = Py_BuildValue("(iiii)",
s.texture_index, s.sprite_index, s.x, s.y); s.texture_index, s.sprite_index, s.x, s.y);
} }