diff options
| author | Christian Tusche <chr13@gmx.net> | 2007-07-29 19:01:17 +0200 |
|---|---|---|
| committer | Thomas Günther <tom@toms-cafe.de> | 2009-06-04 01:30:20 +0200 |
| commit | 3ab2393b6932b34e7f0e69af7f843d1303104d79 (patch) | |
| tree | c1a4f7e6e61f6a09bad4420614be52420506a362 /xml/parser.c | |
| parent | f6f140b2ea0bb1de9e055e920ef9c0c43c6e2add (diff) | |
| download | vdr-plugin-text2skin-chr13-optimizations.tar.gz vdr-plugin-text2skin-chr13-optimizations.tar.bz2 | |
2007-07-29: Version 1.1-cvs_ext-0.11 (text2skin-1.1-cvs_ext-0.11.diff)chr13-optimizations
- moved state tracking of marquee, blink, scroll from cText2SkinRender
to cxObject
- fixed compatibility with gcc-4 and vdr-1.5.x
- fixed use of Update.Lock() in render.h
- new: dynamic width/height of objects
- new: Option "bgColor" used for items "Text", "Marquee", and "Blink".
- remember period to next timeout when doing a non-timeout refresh
prevent occasional start/stop of marquee-text
Diffstat (limited to 'xml/parser.c')
| -rw-r--r-- | xml/parser.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xml/parser.c b/xml/parser.c index 1e3ed73..158724a 100644 --- a/xml/parser.c +++ b/xml/parser.c @@ -159,11 +159,12 @@ bool xStartElem(const std::string &name, std::map<std::string,std::string> &attr || name == "blink" || name == "scrolltext") { ATTRIB_OPT_STRING("color", object->mFg); + ATTRIB_OPT_STRING("bgColor", object->mBg); ATTRIB_OPT_FUNC ("align", object->ParseAlignment); ATTRIB_OPT_FUNC ("font", object->ParseFontFace); if (name == "blink") { - ATTRIB_OPT_STRING("blinkColor", object->mBg); + ATTRIB_OPT_STRING("blinkColor", object->mBl); ATTRIB_OPT_NUMBER("delay", object->mDelay); if (object->mDelay == 0) @@ -196,6 +197,9 @@ bool xStartElem(const std::string &name, std::map<std::string,std::string> &attr else if (name == "item") { ATTRIB_MAN_NUMBER("height", object->mPos2.y); --object->mPos2.y; + } else if (name == "block" || name == "list") { + ATTRIB_OPT_NUMBER("w", object->mVirtSize.w); + ATTRIB_OPT_NUMBER("h", object->mVirtSize.h); } } else TAG_ERR_REMAIN(context[context.size() - 1].c_str()); |