diff options
| author | lordjaxom <lordjaxom> | 2005-01-26 20:39:34 +0000 |
|---|---|---|
| committer | lordjaxom <lordjaxom> | 2005-01-26 20:39:34 +0000 |
| commit | 5394e3dc8d32c7b7530b33d2a66237ea103a1c78 (patch) | |
| tree | 81b1c2abbb72952ac1eac58220bb8a405a257a0f | |
| parent | 27360784373d7b18beb665c406fd43a866d2bb46 (diff) | |
| download | vdr-plugin-text2skin-5394e3dc8d32c7b7530b33d2a66237ea103a1c78.tar.gz vdr-plugin-text2skin-5394e3dc8d32c7b7530b33d2a66237ea103a1c78.tar.bz2 | |
- consistent parent element handling
- added mask color
| -rw-r--r-- | xml/object.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/xml/object.c b/xml/object.c index 47fad87..6ea0ab6 100644 --- a/xml/object.c +++ b/xml/object.c @@ -1,5 +1,5 @@ /* - * $Id: object.c,v 1.10 2005/01/15 20:54:08 lordjaxom Exp $ + * $Id: object.c,v 1.11 2005/01/26 20:39:34 lordjaxom Exp $ */ #include "xml/object.h" @@ -10,21 +10,21 @@ static const std::string ObjectNames[] = { "image", "text", "marquee", "blink", "rectangle", "ellipse", "slope", "progress", "scrolltext", "scrollbar", "block", "list", "item" }; -cxObject::cxObject(cxDisplay *parent): - mDisplay(parent), - mSkin(parent->Skin()), +cxObject::cxObject(cxDisplay *Parent): + mDisplay(Parent), + mSkin(Parent->Skin()), mType((eType)__COUNT_OBJECT__), mPos1(0, 0), mPos2(-1, -1), mAlpha(255), mColors(0), mArc(0), - mPath(parent->Skin(), false), - mText(mSkin, true), + mPath(this, false), + mText(this, true), mAlign(taDefault), mCondition(NULL), - mCurrent(mSkin, false), - mTotal(mSkin, false), + mCurrent(this, false), + mTotal(this, false), mFontFace("Osd"), mFontSize(0), mFontWidth(0), @@ -45,6 +45,7 @@ cxObject::cxObject(const cxObject &Src): mArc(Src.mArc), mFg(Src.mFg), mBg(Src.mBg), + mMask(Src.mMask), mMark(Src.mMark), mActive(Src.mActive), mKeep(Src.mKeep), @@ -85,7 +86,7 @@ bool cxObject::ParseType(const std::string &Text) bool cxObject::ParseCondition(const std::string &Text) { - cxFunction *result = new cxFunction(mSkin); + cxFunction *result = new cxFunction(this); if (result->Parse(Text)) { delete mCondition; mCondition = result; @@ -181,6 +182,12 @@ const tColor *cxObject::Bg(void) const return cText2SkinRender::ItemColor(mBg, Bg) ? &Bg : NULL; } +const tColor *cxObject::Mask(void) const +{ + static tColor Mask; + return cText2SkinRender::ItemColor(mMask, Mask) ? &Mask : NULL; +} + const tColor *cxObject::Mark(void) const { static tColor Mark; |