nedko/trmnl_sdl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to more memory safe implementation of widget holding

Browse Source
This commit is contained in:
nedko 2025-12-12 15:35:32 +02:00
parent ddc7898a78
commit 8e276ab2ab
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Widgets/Widget.h
View File

@ -3,6 +3,7 @@
#include <SDL2/SDL.h>
#include "../json.hpp"
#include <memory>
class Widget
{

4
Widgets/WidgetRect.cpp
View File

@ -97,7 +97,7 @@ void WidgetRect::draw()
}
}
Widget* WidgetRect::builder(const nlohmann::json& j)
std::unique_ptr<Widget> WidgetRect::builder(const nlohmann::json& j)
{
int x = 0;
int y = 0;
@ -115,7 +115,7 @@ Widget* WidgetRect::builder(const nlohmann::json& j)
json_extract(j, "stroke", stroke_size);
json_extract(j, "color", color);
return new WidgetRect(x, y, width, height, radius, stroke_size, color);
return std::make_unique<WidgetRect>(x, y, width, height, radius, stroke_size, color);
}
void WidgetRect::draw_circle_corner(int x, int y, int quadrant)

2
Widgets/WidgetRect.h
View File

@ -28,7 +28,7 @@ public:
virtual void draw() override;
static Widget* builder(const nlohmann::json& j);
static std::unique_ptr<Widget> builder(const nlohmann::json& j);
private:
// x, y - center of circle

4
Widgets/WidgetText.cpp
View File

@ -262,7 +262,7 @@ void WidgetText::draw()
SDL_FreeSurface(txt_surface);
}
Widget* WidgetText::builder(const nlohmann::json& j)
std::unique_ptr<Widget> WidgetText::builder(const nlohmann::json& j)
{
int x = 0;
int y = 0;
@ -299,7 +299,7 @@ Widget* WidgetText::builder(const nlohmann::json& j)
return nullptr;
}
return new WidgetText(x, y, width, height,
return std::make_unique<WidgetText>(x, y, width, height,
text, fit, should_wrap,
halign, valign,
halign_via_visible, valign_via_visible,

2
Widgets/WidgetText.h
View File

@ -73,7 +73,7 @@ public:
virtual void draw() override;
static Widget* builder(const nlohmann::json& j);
static std::unique_ptr<Widget> builder(const nlohmann::json& j);
};
#endif // WIDGET_TEXT_H_

20
main.cpp
View File

@ -4,6 +4,7 @@
#include <iostream>
#include <map>
#include <memory>
#include <string>
#include <vector>
@ -17,14 +18,16 @@
using std::cout;
using std::endl;
using std::map;
using std::shared_ptr;
using std::string;
using std::unique_ptr;
using std::vector;
using nlohmann::json;
void init_builders(map<string, Widget*(*)(const json&)>& widget_builders)
void init_builders(map<string, unique_ptr<Widget>(*)(const json&)>& widget_builders)
{
widget_builders["text"] = &WidgetText::builder;
widget_builders["rect"] = &WidgetRect::builder;
widget_builders["text"] = &WidgetText::builder;
}
int main(int argc, char **argv)
@ -41,8 +44,8 @@ int main(int argc, char **argv)
SDL_Surface* main_surface = nullptr;
vector<json> widgets_cfg;
vector<Widget*> widgets;
map<string, Widget*(*)(const json&)> widget_builders;
vector<shared_ptr<Widget>> widgets;
map<string, unique_ptr<Widget>(*)(const json&)> widget_builders;
ok = init_sdl();
if (!ok)
@ -102,7 +105,7 @@ int main(int argc, char **argv)
}
// Construct and add widget to vector
Widget* widget = widget_builders[widget_name](j);
shared_ptr<Widget> widget = widget_builders[widget_name](j);
if (nullptr != widget)
{
widgets.push_back(widget);
@ -113,7 +116,7 @@ int main(int argc, char **argv)
SDL_FillRect(main_surface, nullptr, SDL_MapRGBA(main_surface->format, 255, 255, 255, SDL_ALPHA_OPAQUE));
// Draw and apply all widgets
for (Widget* widget : widgets)
for (shared_ptr<Widget>& widget : widgets)
{
widget->draw();
SDL_Rect rect = widget->get_rect();
@ -125,11 +128,6 @@ int main(int argc, char **argv)
IMG_SavePNG(main_surface, output_filename.c_str());
cleanup:
// Destroy All Widgets
for (Widget* widget : widgets)
{
delete widget;
}
widgets.clear();
clean_sdl();