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

nice-ifying UIFrame __init__ and making debug a bit easier

This commit is contained in:
John McCardle 2024-03-07 11:19:46 -05:00
parent d417bdc8a3
commit 343669df1e
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/UI.h
View File

@ -961,7 +961,7 @@ static int PyUIDrawable_set_click(PyUIGridObject* self, PyObject* value, void* c
box.getSize().x << ", w=" << box.getSize().y << ", " << box.getSize().x << ", w=" << box.getSize().y << ", " <<
"outline=" << box.getOutlineThickness() << ", " << "outline=" << box.getOutlineThickness() << ", " <<
"fill_color=(" << (int)fc.r << ", " << (int)fc.g << ", " << (int)fc.b << ", " << (int)fc.a <<"), " << "fill_color=(" << (int)fc.r << ", " << (int)fc.g << ", " << (int)fc.b << ", " << (int)fc.a <<"), " <<
"outlinecolor=(" << (int)oc.r << ", " << (int)oc.g << ", " << (int)oc.b << ", " << (int)oc.a <<"), " << "outline_color=(" << (int)oc.r << ", " << (int)oc.g << ", " << (int)oc.b << ", " << (int)oc.a <<"), " <<
self->data->children->size() << " child objects" << self->data->children->size() << " child objects" <<
")>"; ")>";
} }
@ -972,19 +972,29 @@ static int PyUIDrawable_set_click(PyUIGridObject* self, PyObject* value, void* c
static int PyUIFrame_init(PyUIFrameObject* self, PyObject* args, PyObject* kwds) static int PyUIFrame_init(PyUIFrameObject* self, PyObject* args, PyObject* kwds)
{ {
//std::cout << "Init called\n"; //std::cout << "Init called\n";
static const char* keywords[] = { "x", "y", nullptr }; static const char* keywords[] = { "x", "y", "w", "h", "fill_color", "outline_color", "outline", nullptr };
float x = 0.0f, y = 0.0f; float x = 0.0f, y = 0.0f, w = 0.0f, h=0.0f, outline=0.0f;
PyObject* fill_color = 0;
PyObject* outline_color = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ff", const_cast<char**>(keywords), &x, &y)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "ffff|OOf", const_cast<char**>(keywords), &x, &y, &w, &h, &fill_color, &outline_color, &outline))
{ {
return -1; return -1;
} }
//self->data->x = x; //self->data->x = x;
//self->data->y = y; //self->data->y = y;
self->data->box.setFillColor(sf::Color(0,0,0,255)); self->data->box.setPosition(sf::Vector2f(x, y));
self->data->box.setOutlineColor(sf::Color(128,128,128,255)); self->data->box.setSize(sf::Vector2f(w, h));
self->data->box.setOutlineThickness(outline);
// getsetter abuse because I haven't standardized Color object parsing (TODO)
int err_val = 0;
if (fill_color && fill_color != Py_None) err_val = PyUIFrame_set_color_member(self, fill_color, (void*)0);
else self->data->box.setFillColor(sf::Color(0,0,0,255));
if (err_val) return err_val;
if (outline_color && outline_color != Py_None) err_val = PyUIFrame_set_color_member(self, outline_color, (void*)1);
else self->data->box.setOutlineColor(sf::Color(128,128,128,255));
if (err_val) return err_val;
return 0; return 0;
} }

2
src/UITestScene.cpp
View File

@ -5,7 +5,7 @@
UITestScene::UITestScene(GameEngine* g) : Scene(g) UITestScene::UITestScene(GameEngine* g) : Scene(g)
{ {
text.setFont(game->getFont()); text.setFont(game->getFont());
text.setString("Test Scene for UI elements"); text.setString("UITest: surprised to be here? game.py raised an exception.");
text.setCharacterSize(24); text.setCharacterSize(24);