Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-20 15:37:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

reorganize sources

Browse Source
This commit is contained in:
Eduardo Bart
2011-08-15 11:06:15 -03:00
parent 4e03b15b27
commit d8cc37afdb
113 changed files with 621 additions and 3437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,12 +3,12 @@
#include "uilayout.h"
#include "uianchorlayout.h"
#include <core/eventdispatcher.h>
#include <graphics/image.h>
#include <graphics/borderimage.h>
#include <graphics/fontmanager.h>
#include <otml/otmlnode.h>
#include <graphics/graphics.h>
#include <framework/core/eventdispatcher.h>
#include <framework/graphics/image.h>
#include <framework/graphics/borderimage.h>
#include <framework/graphics/fontmanager.h>
#include <framework/otml/otmlnode.h>
#include <framework/graphics/graphics.h>
UIWidget::UIWidget(UIWidgetType type)
{
@@ -26,7 +26,7 @@ UIWidget::UIWidget(UIWidgetType type)
// generate an unique id, this is need because anchored layouts find widgets by id
static unsigned long id = 1;
m_id = aux::make_string("widget", id++);
m_id = fw::mkstr("widget", id++);
}
UIWidget::~UIWidget()
@@ -172,7 +172,7 @@ void UIWidget::loadStyleFromOTML(const OTMLNodePtr& styleNode)
} else if(what == "centerIn") {
centerIn(node->value());
} else {
AnchorPoint myEdge = parseAnchorPoint(what);
AnchorPoint myEdge = fw::translateAnchorPoint(what);
std::string anchorDescription = node->value();
std::vector<std::string> split;
@@ -181,7 +181,7 @@ void UIWidget::loadStyleFromOTML(const OTMLNodePtr& styleNode)
throw OTMLException(node, "invalid anchor description");
std::string target = split[0];
AnchorPoint targetEdge = parseAnchorPoint(split[1]);
AnchorPoint targetEdge = fw::translateAnchorPoint(split[1]);
if(myEdge == AnchorNone)
throw OTMLException(node, "invalid anchor edge");