diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-07-09 13:48:15 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-07-09 13:48:15 +0200 |
| commit | 21d15ba6ddf7440f229eb627ff3cc28393e3faee (patch) | |
| tree | 73d8ea9035bb3f8186cc80faf24181392752d0d2 /glcdskin/object.h | |
| parent | 8b40680aa394e0b0cdc9b78229bf3b513ec4459e (diff) | |
| download | graphlcd-base-21d15ba6ddf7440f229eb627ff3cc28393e3faee.tar.gz graphlcd-base-21d15ba6ddf7440f229eb627ff3cc28393e3faee.tar.bz2 | |
position (x/y/x1/y1/x2/y2) and dimension (width/height) parameters are now evaluated at run time
Diffstat (limited to 'glcdskin/object.h')
| -rw-r--r-- | glcdskin/object.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/glcdskin/object.h b/glcdskin/object.h index e48b46f..cbb6966 100644 --- a/glcdskin/object.h +++ b/glcdskin/object.h @@ -121,8 +121,14 @@ private: cSkinDisplay * mDisplay; // parent display cSkin * mSkin; eType mType; // type of object, one of enum eType - tPoint mPos1; - tPoint mPos2; + //tPoint mPos1; + //tPoint mPos2; + cSkinString mX1; // either mX1 and mWidth or mX1 and mX2 are defined. not all three + cSkinString mY1; + cSkinString mX2; + cSkinString mY2; + cSkinString mWidth; + cSkinString mHeight; cSkinColor mColor; cSkinColor mBackgroundColor; bool mFilled; @@ -133,13 +139,15 @@ private: eTextVerticalAlignment mVerticalAlign; bool mMultiline; cSkinString mPath; - cSkinString mCurrent; - cSkinString mTotal; + cSkinString mCurrent; // progress bar: current value + cSkinString mTotal; // progress bar: maximum valid value + cSkinString mPeak; // progress bar: peak value (<= 0: disabled) cSkinString mFont; cSkinString mText; cSkinFunction * mCondition; eEffect mEffect; // effect: none, shadow, or outline cSkinColor mEffectColor; // effect colour (= shadow colour or colour of outline) + cSkinColor mPeakColor; // colour of peak marker uint64_t mLastChange; // timestamp: last change in dynamic object (scroll, frame change, ...) int mChangeDelay; // delay between two changes (frame change, scrolling, ...) @@ -176,8 +184,8 @@ public: bool ParseEffect(const std::string &Text); bool ParseFontFace(const std::string &Text); bool ParseIntParam(const std::string &Text, int & Param); - bool ParseWidth(const std::string &Text); - bool ParseHeight(const std::string &Text); + //bool ParseWidth(const std::string &Text); + //bool ParseHeight(const std::string &Text); bool ParseScrollLoopMode(const std::string & Text); // parse scroll mode ([never|once|always]) bool ParseScrollSpeed(const std::string & Text); // parse scroll speed |