diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-06-09 23:23:38 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-06-09 23:23:38 +0200 |
| commit | 7fdaefe7ae28ebcfdbacd6dee7069f9ee23d371b (patch) | |
| tree | 92a78fd49221b3b6a97788a3501d6f2b1adae0ec | |
| parent | fc3498cc8fb7cbf7ed2c563f56b030f04c087a3a (diff) | |
| download | graphlcd-base-7fdaefe7ae28ebcfdbacd6dee7069f9ee23d371b.tar.gz graphlcd-base-7fdaefe7ae28ebcfdbacd6dee7069f9ee23d371b.tar.bz2 | |
attributes 'x' and 'y' may now be used for all objects; 'font' is now mandatory for <text/> and <button/>
| -rw-r--r-- | glcdskin/parser.c | 12 |
1 files 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") |