From 7fdaefe7ae28ebcfdbacd6dee7069f9ee23d371b Mon Sep 17 00:00:00 2001
From: mrwastl <mrwastl@users.sourceforge.net>
Date: Thu, 9 Jun 2011 23:23:38 +0200
Subject: attributes 'x' and 'y' may now be used for all objects; 'font' is now
 mandatory for <text/> and <button/>

---
 glcdskin/parser.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/glcdskin/parser.c b/glcdskin/parser.c
index d64f1c6..cb90fa0 100644
--- a/glcdskin/parser.c
+++ b/glcdskin/parser.c
@@ -262,6 +262,8 @@ bool StartElem(const std::string & name, std::map<std::string,std::string> & att
 
         if (object->ParseType(name))
         {
+            ATTRIB_OPT_FUNC_PARAM("x", object->ParseIntParam, object->mPos1.x);
+            ATTRIB_OPT_FUNC_PARAM("y", object->ParseIntParam, object->mPos1.y);
             ATTRIB_OPT_FUNC_PARAM("x1", object->ParseIntParam, object->mPos1.x);
             ATTRIB_OPT_FUNC_PARAM("y1", object->ParseIntParam, object->mPos1.y);
             ATTRIB_OPT_FUNC_PARAM("x2", object->ParseIntParam, object->mPos2.x);
@@ -273,10 +275,8 @@ bool StartElem(const std::string & name, std::map<std::string,std::string> & att
 
             if (name == "image")
             {
-                ATTRIB_OPT_FUNC_PARAM("x", object->ParseIntParam, object->mPos1.x);
-                ATTRIB_OPT_FUNC_PARAM("y", object->ParseIntParam, object->mPos1.y);
-                ATTRIB_OPT_FUNC_PARAM("x", object->ParseIntParam, object->mPos2.x);
-                ATTRIB_OPT_FUNC_PARAM("y", object->ParseIntParam, object->mPos2.y);
+                //ATTRIB_OPT_FUNC_PARAM("x", object->ParseIntParam, object->mPos2.x);
+                //ATTRIB_OPT_FUNC_PARAM("y", object->ParseIntParam, object->mPos2.y);
                 ATTRIB_OPT_FUNC_PARAM("color", object->ParseColor, object->mColor);
                 ATTRIB_OPT_FUNC_PARAM("bgcolor", object->ParseColor, object->mBackgroundColor);
                 ATTRIB_MAN_FUNC("path", object->mPath.Parse);
@@ -289,7 +289,7 @@ bool StartElem(const std::string & name, std::map<std::string,std::string> & att
                 ATTRIB_OPT_FUNC_PARAM("bgcolor", object->ParseColor, object->mBackgroundColor);
                 ATTRIB_OPT_FUNC("align", object->ParseAlignment);
                 ATTRIB_OPT_FUNC("valign", object->ParseVerticalAlignment);
-                ATTRIB_OPT_FUNC("font", object->ParseFontFace);
+                ATTRIB_MAN_FUNC("font", object->ParseFontFace);
                 ATTRIB_OPT_BOOL("multiline", object->mMultiline);
                 ATTRIB_OPT_FUNC("scrollmode", object->ParseScrollLoopMode);
                 ATTRIB_OPT_FUNC("scrollspeed", object->ParseScrollSpeed);
@@ -303,7 +303,7 @@ bool StartElem(const std::string & name, std::map<std::string,std::string> & att
             {
                 ATTRIB_OPT_FUNC_PARAM("labelcolor", object->ParseColor, object->mColor);
                 ATTRIB_OPT_FUNC_PARAM("color", object->ParseColor, object->mBackgroundColor);
-                ATTRIB_OPT_FUNC("font", object->ParseFontFace);
+                ATTRIB_MAN_FUNC("font", object->ParseFontFace);
                 ATTRIB_OPT_NUMBER("radius", object->mRadius);
             }
             else if (name == "pixel")
-- 
cgit v1.2.3