games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-27 00:41:08 +02:00
Code Issues Releases Activity

Implemented simple layout to simplify widget json definitions

Browse Source
This commit is contained in:
Ivan Savenko
2023-05-15 12:48:58 +03:00
parent 7cd898a87a
commit 7cbfd8117e
3 changed files with 140 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
client/gui/InterfaceObjectConfigurable.cpp
View File

@ -46,6 +46,7 @@ InterfaceObjectConfigurable::InterfaceObjectConfigurable(int used, Point offset)
REGISTER_BUILDER("button", &InterfaceObjectConfigurable::buildButton);
REGISTER_BUILDER("labelGroup", &InterfaceObjectConfigurable::buildLabelGroup);
REGISTER_BUILDER("slider", &InterfaceObjectConfigurable::buildSlider);
REGISTER_BUILDER("layout", &InterfaceObjectConfigurable::buildLayout);
}
void InterfaceObjectConfigurable::registerBuilder(const std::string & type, BuilderFunction f)
@ -468,6 +469,54 @@ std::shared_ptr<CFilledTexture> InterfaceObjectConfigurable::buildTexture(const
return std::make_shared<CFilledTexture>(image, rect);
}
/// Small helper class that provides ownership for shared_ptr's of child elements
class InterfaceLayoutWidget : public CIntObject
{
public:
std::vector<std::shared_ptr<CIntObject>> ownedChildren;
};
std::shared_ptr<CIntObject> InterfaceObjectConfigurable::buildLayout(const JsonNode & config)
{
logGlobal->debug("Building widget Layout");
bool vertical = config["vertical"].Bool();
bool horizontal = config["horizontal"].Bool();
bool dynamic = config["dynamic"].Bool();
int distance = config["distance"].Integer();
std::string customType = config["customType"].String();
auto position = readPosition(config["position"]);
auto result = std::make_shared<InterfaceLayoutWidget>();
result->moveBy(position);
Point layoutPosition;
for(auto item : config["items"].Vector())
{
if (item["type"].String().empty())
item["type"].String() = customType;
auto widget = buildWidget(item);
addWidget(item["name"].String(), widget);
result->ownedChildren.push_back(widget);
result->addChild(widget.get(), false);
widget->moveBy(position + layoutPosition);
if (dynamic && vertical)
layoutPosition.y += widget->pos.h;
if (dynamic && horizontal)
layoutPosition.x += widget->pos.w;
if (vertical)
layoutPosition.y += distance;
if (horizontal)
layoutPosition.x += distance;
}
return result;
}
std::shared_ptr<CShowableAnim> InterfaceObjectConfigurable::buildAnimation(const JsonNode & config) const
{
logGlobal->debug("Building widget CShowableAnim");