reorganize sources

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

View File

@@ -1,6 +1,6 @@
#include "uilabel.h"
#include <graphics/font.h>
#include <otml/otmlnode.h>
#include <framework/graphics/font.h>
#include <framework/otml/otmlnode.h>
UILabel::UILabel() : UIWidget(UITypeLabel)
{
@@ -21,7 +21,7 @@ void UILabel::loadStyleFromOTML(const OTMLNodePtr& styleNode)
m_text = styleNode->readAt("text", m_text);
if(styleNode->hasChild("align"))
m_align = parseAlignment(styleNode->readAt<std::string>("align"));
m_align = fw::translateAlignment(styleNode->readAt<std::string>("align"));
// auto resize if no size supplied
if(!m_text.empty() && !getGeometry().isValid())