rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New layout system failed to find widgets by name because they were already converted to lowercase while the search was case-sensitive

0.8
Bruno Van de Velde 2017-08-29 19:55:34 +02:00
parent 33e8cbb339
commit c2a6e4d043
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/TGUI/Layout.cpp
View File

@ -59,7 +59,7 @@ namespace tgui
else
{
// The expression might reference to a widget instead of being a constant
expression = tgui::toLower(expression);
expression = toLower(expression);
if ((expression.substr(expression.size()-1) == "x")
|| (expression.substr(expression.size()-1) == "y")
|| (expression.substr(expression.size()-1) == "w") // width
@ -547,17 +547,25 @@ namespace tgui
Container* container = dynamic_cast<Container*>(widget);
if (container != nullptr)
{
auto widgetToBind = container->get(widgetName);
if (widgetToBind)
return parseBindingString(expression.substr(dotPos+1), widgetToBind.get(), xAxis);
const auto& widgets = container->getWidgets();
const auto& widgetNames = container->getWidgetNames();
for (std::size_t i = 0; i < widgets.size(); ++i)
{
if (toLower(widgetNames[i]) == widgetName)
return parseBindingString(expression.substr(dotPos+1), widgets[i].get(), xAxis);
}
}
// If the widget has a parent, look for a sibling
if (widget->getParent())
{
auto widgetToBind = widget->getParent()->get(widgetName);
if (widgetToBind)
return parseBindingString(expression.substr(dotPos+1), widgetToBind.get(), xAxis);
const auto& widgets = widget->getParent()->getWidgets();
const auto& widgetNames = widget->getParent()->getWidgetNames();
for (std::size_t i = 0; i < widgets.size(); ++i)
{
if (toLower(widgetNames[i]) == widgetName)
return parseBindingString(expression.substr(dotPos+1), widgets[i].get(), xAxis);
}
}
}
}