diff options
| author | lordjaxom <lordjaxom> | 2004-12-29 00:38:08 +0000 |
|---|---|---|
| committer | lordjaxom <lordjaxom> | 2004-12-29 00:38:08 +0000 |
| commit | 40fd20f76dabaed2488756117967025ec7bf6b1f (patch) | |
| tree | 6dff7d2ae0bf95f001bfa1bde9700c94d35d0627 | |
| parent | fc7714207456e15be83388d33d51b582783b3980 (diff) | |
| download | vdr-plugin-text2skin-40fd20f76dabaed2488756117967025ec7bf6b1f.tar.gz vdr-plugin-text2skin-40fd20f76dabaed2488756117967025ec7bf6b1f.tar.bz2 | |
- fixed marquee in lists
| -rw-r--r-- | render.c | 5 | ||||
| -rw-r--r-- | xml/object.c | 4 | ||||
| -rw-r--r-- | xml/parser.c | 5 |
3 files changed, 9 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* - * $Id: render.c,v 1.9 2004/12/28 18:06:02 lordjaxom Exp $ + * $Id: render.c,v 1.10 2004/12/29 00:38:08 lordjaxom Exp $ */ #include "render.h" @@ -297,7 +297,6 @@ void cText2SkinRender::DrawMarquee(const txPoint &Pos, const txSize &Size, const state = tState(); state.text = Text; } - Dprintf("drawMarquee state.text = %s, offset = %d\n", state.text.c_str(), state.offset); if (state.nexttime == 0) state.nexttime = mNow + 1500; @@ -325,6 +324,8 @@ void cText2SkinRender::DrawMarquee(const txPoint &Pos, const txSize &Size, const if (mUpdateIn == 0 || updatein < mUpdateIn) mUpdateIn = updatein; } + Dprintf("drawMarquee text = %s, state.text = %s, offset = %d, index = %d, scrolling = %d, mUpdatteIn = %d, nexttime = %d, delay = %d\n", + Text.c_str(), state.text.c_str(), state.offset, Index, scrolling, mUpdateIn, state.nexttime, Delay); mScreen->DrawText(Pos.x, Pos.y, Text.c_str() + state.offset, Fg ? *Fg : 0, clrTransparent, Font, Size.w, Size.h, Align); diff --git a/xml/object.c b/xml/object.c index 20e0eb3..e9d54ca 100644 --- a/xml/object.c +++ b/xml/object.c @@ -1,5 +1,5 @@ /* - * $Id: object.c,v 1.6 2004/12/28 18:03:24 lordjaxom Exp $ + * $Id: object.c,v 1.7 2004/12/29 00:38:08 lordjaxom Exp $ */ #include "xml/object.h" @@ -51,7 +51,7 @@ cxObject::cxObject(const cxObject &Src): mFontFace(Src.mFontFace), mFontSize(Src.mFontSize), mFontWidth(Src.mFontSize), - mDelay(0), + mDelay(Src.mDelay), mObjects(NULL), mDisplay(Src.mDisplay), mSkin(Src.mSkin) diff --git a/xml/parser.c b/xml/parser.c index 02de60e..02c1c4a 100644 --- a/xml/parser.c +++ b/xml/parser.c @@ -1,5 +1,5 @@ /* - * $Id: parser.c,v 1.4 2004/12/28 14:25:45 lordjaxom Exp $ + * $Id: parser.c,v 1.5 2004/12/29 00:38:08 lordjaxom Exp $ */ #include "xml/parser.h" @@ -244,6 +244,9 @@ bool xEndElem(const std::string &name) { if (object->mCondition == NULL) { switch (object->mType) { case cxObject::text: + case cxObject::marquee: + case cxObject::blink: + case cxObject::scrolltext: object->mCondition = new cxFunction(object->mText); break; |