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

🔨 Refactored Layout::connectWidget function and removed unused m_connectedWidget member

0.8
Bruno Van de Velde 2017-09-21 01:06:46 +02:00
parent 1c0950c8d3
commit 35ea22db57
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/TGUI/Layout.hpp
View File

@ -200,6 +200,12 @@ namespace tgui
void resetPointers();
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Check whether sublayouts contain a string that refers to a widget which should be bound.
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void parseBindingStringRecursive(Widget* widget, bool xAxis);
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Find the widget corresponding to the given name and bind it if found
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -216,7 +222,6 @@ namespace tgui
std::unique_ptr<Layout> m_rightOperand = nullptr; // The left operand of the operation in case the operation is a math operation
Widget* m_boundWidget = nullptr; // The widget on which this layout depends in case the operation is a binding
std::string m_boundString; // String referring to a widget on which this layout depends in case the layout was created from a string and contains a binding operation
Widget* m_connectedWidget = nullptr; // The widget that uses this layout for its position or size
std::function<void()> m_connectedWidgetCallback = nullptr; // Function to call when the value of the layout changes in case the layout and sublayouts are not all constants
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

46
src/TGUI/Layout.cpp
View File

@ -266,8 +266,7 @@ namespace tgui
m_leftOperand {other.m_leftOperand ? make_unique<Layout>(*other.m_leftOperand) : nullptr},
m_rightOperand {other.m_rightOperand ? make_unique<Layout>(*other.m_rightOperand) : nullptr},
m_boundWidget {other.m_boundWidget},
m_boundString {other.m_boundString},
m_connectedWidget{nullptr}
m_boundString {other.m_boundString}
{
// Disconnect the bound widget if a string was used, the same name may apply to a different widget now
if (!m_boundString.empty())
@ -285,8 +284,7 @@ namespace tgui
m_leftOperand {std::move(other.m_leftOperand)},
m_rightOperand {std::move(other.m_rightOperand)},
m_boundWidget {other.m_boundWidget},
m_boundString {std::move(other.m_boundString)},
m_connectedWidget{nullptr}
m_boundString {std::move(other.m_boundString)}
{
resetPointers();
}
@ -304,7 +302,6 @@ namespace tgui
m_rightOperand = other.m_rightOperand ? make_unique<Layout>(*other.m_rightOperand) : nullptr;
m_boundWidget = other.m_boundWidget;
m_boundString = other.m_boundString;
m_connectedWidget = nullptr;
// Disconnect the bound widget if a string was used, the same name may apply to a different widget now
if (!m_boundString.empty())
@ -329,7 +326,6 @@ namespace tgui
m_rightOperand = std::move(other.m_rightOperand);
m_boundWidget = other.m_boundWidget;
m_boundString = std::move(other.m_boundString);
m_connectedWidget = nullptr;
resetPointers();
}
@ -415,20 +411,21 @@ namespace tgui
void Layout::connectWidget(Widget* widget, bool xAxis, std::function<void()> valueChangedCallbackHandler)
{
m_connectedWidget = widget;
const float oldValue = m_value;
// No callbacks must be made while parsing, a single callback will be made when done if needed
m_connectedWidgetCallback = nullptr;
parseBindingStringRecursive(widget, xAxis);
// Restore the callback function
m_connectedWidgetCallback = valueChangedCallbackHandler;
if (m_leftOperand)
if (m_value != oldValue)
{
assert(m_rightOperand != nullptr);
m_leftOperand->connectWidget(widget, xAxis, nullptr);
m_rightOperand->connectWidget(widget, xAxis, nullptr);
if (m_connectedWidgetCallback)
m_connectedWidgetCallback();
}
// Parse the string binding even when the referred widget was already found. The widget may be added to a different parent
if (!m_boundString.empty())
parseBindingString(m_boundString, widget, xAxis);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -502,6 +499,23 @@ namespace tgui
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Layout::parseBindingStringRecursive(Widget* widget, bool xAxis)
{
if (m_leftOperand)
{
assert(m_rightOperand != nullptr);
m_leftOperand->parseBindingStringRecursive(widget, xAxis);
m_rightOperand->parseBindingStringRecursive(widget, xAxis);
}
// Parse the string binding even when the referred widget was already found. The widget may be added to a different parent
if (!m_boundString.empty())
parseBindingString(m_boundString, widget, xAxis);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Layout::parseBindingString(const std::string& expression, Widget* widget, bool xAxis)
{
if (expression == "x" || expression == "left")