Merge branch 'master' of github.com:edubart/otclient

src/framework/core/configs.cpp

@@ -35,7 +35,7 @@ bool Configs::load(const std::string& fileName)
         return false;
 
     std::string fileContents = g_resources.loadTextFile(fileName);
-    if(fileContents.size())
+    if(!fileContents.size())
         return false;
 
     std::istringstream fin(fileContents);

src/framework/core/engine.cpp

@@ -133,7 +133,7 @@ void Engine::onClose()
 void Engine::onResize(const Size& size)
 {
     g_graphics.resize(size);
-    UIContainer::getRootContainer()->setSize(Size(size.width()-1, size.height()-1));
+    UIContainer::getRootContainer()->setSize(size);
 
     if(m_currentState)
         m_currentState->onResize(size);

src/framework/ui/uibuttonskin.cpp

@@ -30,8 +30,6 @@ void UIButtonSkin::load(const YAML::Node& node)
 {
     UIElementSkin::load(node);
 
-    std::string tmp;
-
     m_buttonDownImage = loadImage(node["down state"]);
 
     if(node["down state"].FindValue("text translate"))
@@ -40,8 +38,7 @@ void UIButtonSkin::load(const YAML::Node& node)
     if(node.FindValue("mouse over state"))
         m_buttonHoverImage = loadImage(node["mouse over state"]);
 
-    node["font"] >> tmp;
-    m_font = g_fonts.get(tmp);
+    m_font = g_fonts.get(node["font"].Read<std::string>());
 
     node["text color"] >> m_textColor;
 }

src/framework/ui/uicheckbox.cpp

@@ -0,0 +1,7 @@
+#include "uicheckbox.h"
+
+UICheckBox::UICheckBox(UI::EElementType type): UIElement(type)
+{
+
+}
+

src/framework/ui/uicheckbox.h

@@ -0,0 +1,14 @@
+#ifndef UICHECKBOX_H
+#define UICHECKBOX_H
+
+#include <ui/uielement.h>
+
+
+class UICheckBox : public UIElement
+{
+
+public:
+UICheckBox(UI::EElementType type = UI::Element);
+};
+
+#endif // UICHECKBOX_H

src/framework/ui/uicheckboxskin.cpp

@@ -0,0 +1,2 @@
+#include "uicheckboxskin.h"
+

src/framework/ui/uicheckboxskin.h

@@ -0,0 +1,8 @@
+#ifndef UICHECKBOXSKIN_H
+#define UICHECKBOXSKIN_H
+
+class UICheckBoxSkin
+{
+};
+
+#endif // UICHECKBOXSKIN_H

src/framework/ui/uilabelskin.cpp

@@ -29,12 +29,10 @@
 void UILabelSkin::load(const YAML::Node& node)
 {
     UIElementSkin::load(node);
-    std::string tmp;
 
-    if(node.FindValue("font")) {
-        node["font"] >> tmp;
-        m_font = g_fonts.get(tmp);
-    } else
+    if(node.FindValue("font"))
+        m_font = g_fonts.get(node["font"].Read<std::string>());
+    else
         m_font = g_fonts.getDefaultFont();
 
     if(node.FindValue("text color"))

src/framework/ui/uilinedecoration.cpp

@@ -0,0 +1,2 @@
+#include "uilinedecoration.h"
+

src/framework/ui/uilinedecoration.h

@@ -0,0 +1,8 @@
+#ifndef UILINEDECORATION_H
+#define UILINEDECORATION_H
+
+class UILineDecoration
+{
+};
+
+#endif // UILINEDECORATION_H

src/framework/ui/uilinedecorationskin.cpp

@@ -0,0 +1,2 @@
+#include "uilinedecorationskin.h"
+

src/framework/ui/uilinedecorationskin.h

@@ -0,0 +1,8 @@
+#ifndef UILINEDECORATIONSKIN_H
+#define UILINEDECORATIONSKIN_H
+
+class UILineDecorationSkin
+{
+};
+
+#endif // UILINEDECORATIONSKIN_H

src/framework/ui/uiloader.cpp

@@ -142,8 +142,6 @@ void UILoader::loadElements(const UIElementPtr& parent, const YAML::Node& node)
 
 void UILoader::loadElement(const UIElementPtr& element, const YAML::Node& node)
 {
-    std::string tmp;
-
     if(node.FindValue("skin"))
         element->setSkin(g_uiSkins.getElementSkin(element->getElementType(), node["skin"]));
 
@@ -195,18 +193,15 @@ void UILoader::loadElement(const UIElementPtr& element, const YAML::Node& node)
     // load specific element type
     if(element->getElementType() == UI::Button) {
         UIButtonPtr button = boost::static_pointer_cast<UIButton>(element);
-        node["text"] >> tmp;
-        button->setText(tmp);
+        button->setText(node["text"].Read<std::string>());
     }
     else if(element->getElementType() == UI::Window) {
         UIWindowPtr window = boost::static_pointer_cast<UIWindow>(element);
-        node["title"] >> tmp;
-        window->setTitle(tmp);
+        window->setTitle(node["title"].Read<std::string>());
     }
     else if(element->getElementType() == UI::Label) {
         UILabelPtr label = boost::static_pointer_cast<UILabel>(element);
-        node["text"] >> tmp;
-        label->setText(tmp);
+        label->setText(node["text"].Read<std::string>());
     }
 }
 

src/framework/ui/uitexteditskin.cpp

@@ -29,11 +29,9 @@
 void UITextEditSkin::load(const YAML::Node& node)
 {
     UIElementSkin::load(node);
-    std::string tmp;
 
     if(node.FindValue("font")) {
-        node["font"] >> tmp;
-        m_font = g_fonts.get(tmp);
+        m_font = g_fonts.get(node["font"].Read<std::string>());
     } else
         m_font = g_fonts.getDefaultFont();
 

src/framework/util/rect.h

@@ -77,8 +77,8 @@ public:
     inline void setBottomLeft(const TPoint<T> &p) { x1 = p.x; y2 = p.y; }
     inline void setWidth(T width) { x2 = x1 + width - 1; }
     inline void setHeight(T height) { y2 = y1 + height- 1; }
-    inline void setSize(T width, T height) { x2 = x1 + width; y2 = y1 + height; }
-    inline void setSize(const TSize<T>& size) { x2 = x1 + size.width(); y2 = y1 + size.height(); }
+    inline void setSize(T width, T height) { x2 = x1 + width - 1; y2 = y1 + height - 1; }
+    inline void setSize(const TSize<T>& size) { x2 = x1 + size.width() - 1; y2 = y1 + size.height() - 1; }
     inline void setRect(T x, T y, T width, T height) { x1 = x; y1 = y; x2 = (x + width - 1); y2 = (y + height - 1); }
     inline void setCoords(int left, int top, int right, int bottom) { x1 = left; y1 = top; x2 = right; y2 = bottom; }
 

src/framework/util/size.h

@@ -38,7 +38,7 @@ template <class T>
 class TSize
 {
 public:
-    inline TSize() : wd(-1), ht(-1) {};
+    inline TSize() : wd(0), ht(0) {};
     inline TSize(T width, T height) : wd(width), ht(height) { };
     inline TSize(const TSize<T>& other) : wd(other.wd), ht(other.ht) { };