gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add API to remove widget anchors

This commit is contained in:
Eduardo Bart 2012-04-05 19:46:53 -03:00
parent 248ea9e8bc
commit 218f2e4994
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/framework/luafunctions.cpp
View File

@ -73,6 +73,7 @@ void Application::registerLuaFunctions()
g_lua.bindClassMemberFunction<UIWidget>("unlockChild", &UIWidget::unlockChild); g_lua.bindClassMemberFunction<UIWidget>("unlockChild", &UIWidget::unlockChild);
g_lua.bindClassMemberFunction<UIWidget>("applyStyle", &UIWidget::applyStyle); g_lua.bindClassMemberFunction<UIWidget>("applyStyle", &UIWidget::applyStyle);
g_lua.bindClassMemberFunction<UIWidget>("addAnchor", &UIWidget::addAnchor); g_lua.bindClassMemberFunction<UIWidget>("addAnchor", &UIWidget::addAnchor);
g_lua.bindClassMemberFunction<UIWidget>("removeAnchor", &UIWidget::removeAnchor);
g_lua.bindClassMemberFunction<UIWidget>("fill", &UIWidget::fill); g_lua.bindClassMemberFunction<UIWidget>("fill", &UIWidget::fill);
g_lua.bindClassMemberFunction<UIWidget>("centerIn", &UIWidget::centerIn); g_lua.bindClassMemberFunction<UIWidget>("centerIn", &UIWidget::centerIn);
g_lua.bindClassMemberFunction<UIWidget>("breakAnchors", &UIWidget::breakAnchors); g_lua.bindClassMemberFunction<UIWidget>("breakAnchors", &UIWidget::breakAnchors);

5
src/framework/ui/uiwidget.cpp
View File

@ -489,6 +489,11 @@ void UIWidget::addAnchor(Fw::AnchorEdge anchoredEdge, const std::string& hookedW
logError("cannot add anchors to widget ", m_id, ": the parent doesn't use anchors layout"); logError("cannot add anchors to widget ", m_id, ": the parent doesn't use anchors layout");
} }
void UIWidget::removeAnchor(Fw::AnchorEdge anchoredEdge)
{
addAnchor(anchoredEdge, "none", Fw::AnchorNone);
}
void UIWidget::centerIn(const std::string& hookedWidgetId) void UIWidget::centerIn(const std::string& hookedWidgetId)
{ {
if(m_destroyed) if(m_destroyed)

1
src/framework/ui/uiwidget.h
View File

@ -92,6 +92,7 @@ public:
void unlockChild(const UIWidgetPtr& child); void unlockChild(const UIWidgetPtr& child);
void applyStyle(const OTMLNodePtr& styleNode); void applyStyle(const OTMLNodePtr& styleNode);
void addAnchor(Fw::AnchorEdge anchoredEdge, const std::string& hookedWidgetId, Fw::AnchorEdge hookedEdge); void addAnchor(Fw::AnchorEdge anchoredEdge, const std::string& hookedWidgetId, Fw::AnchorEdge hookedEdge);
void removeAnchor(Fw::AnchorEdge anchoredEdge);
void fill(const std::string& hookedWidgetId); void fill(const std::string& hookedWidgetId);
void centerIn(const std::string& hookedWidgetId); void centerIn(const std::string& hookedWidgetId);
void breakAnchors(); void breakAnchors();

24
src/framework/ui/uiwidgetbasestyle.cpp
View File

@ -278,20 +278,24 @@ void UIWidget::parseBaseStyle(const OTMLNodePtr& styleNode)
} else { } else {
Fw::AnchorEdge anchoredEdge = Fw::translateAnchorEdge(what); Fw::AnchorEdge anchoredEdge = Fw::translateAnchorEdge(what);
std::vector<std::string> split = Fw::split(node->value(), "."); if(node->value() == "none") {
if(split.size() != 2) removeAnchor(anchoredEdge);
throw OTMLException(node, "invalid anchor description"); } else {
std::vector<std::string> split = Fw::split(node->value(), ".");
if(split.size() != 2)
throw OTMLException(node, "invalid anchor description");
std::string hookedWidgetId = split[0]; std::string hookedWidgetId = split[0];
Fw::AnchorEdge hookedEdge = Fw::translateAnchorEdge(split[1]); Fw::AnchorEdge hookedEdge = Fw::translateAnchorEdge(split[1]);
if(anchoredEdge == Fw::AnchorNone) if(anchoredEdge == Fw::AnchorNone)
throw OTMLException(node, "invalid anchor edge"); throw OTMLException(node, "invalid anchor edge");
if(hookedEdge == Fw::AnchorNone) if(hookedEdge == Fw::AnchorNone)
throw OTMLException(node, "invalid anchor target edge"); throw OTMLException(node, "invalid anchor target edge");
addAnchor(anchoredEdge, hookedWidgetId, hookedEdge); addAnchor(anchoredEdge, hookedWidgetId, hookedEdge);
}
} }
// lua functions // lua functions
} else if(boost::starts_with(node->tag(), "@")) { } else if(boost::starts_with(node->tag(), "@")) {