From 1d3cd38e88ae97dd6906f9818d52b9ef07bf057d Mon Sep 17 00:00:00 2001 From: lordjaxom Date: Wed, 16 Jun 2004 18:50:57 +0000 Subject: - fixed disappearing Scrolltext when Message was displayed - fixed display-items "MenuScrollUp" and "MenuScrollDown" which didn't display any other items than "Symbol" - fixed the above for all replay- and channel-symbols (for all display-items that can be symbols there must be path, altpath or both to tell the plugin if that item is to be drawn if the symbol is on, off or in both cases) - fixed various memory leaks and missing destructions (valgrind rox) - fixed the image loaders to respect the alpha value and palette properly (this hopefully also fixes the phenomenon that images "get lost" after some time) - added display-item "Scrollbar" - SKINS and SKINS.de are now generated during the make --- render.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'render.h') diff --git a/render.h b/render.h index 2433dbf..b47db56 100644 --- a/render.h +++ b/render.h @@ -1,5 +1,5 @@ /* - * $Id: render.h,v 1.21 2004/06/12 18:00:05 lordjaxom Exp $ + * $Id: render.h,v 1.22 2004/06/16 18:46:50 lordjaxom Exp $ */ #ifndef VDR_TEXT2SKIN_RENDER_H @@ -37,6 +37,7 @@ private: string text; string path; int current; + int shown; int total; const cMarks *marks; ItemData(void) { marks = NULL; } @@ -113,7 +114,8 @@ protected: void DrawSlope(const POINT &Pos, const SIZE &Size, const tColor *Fg, int Arc); void DrawProgressbar(const POINT &Pos, const SIZE &Size, int Current, int Total, const tColor *Fg, const tColor *Bg, const cMarks *Marks = NULL); void DrawMark(const POINT &Pos, const SIZE &Size, bool Start, bool Current, bool Horizontal); - void DrawScrollText(const POINT &Pos, const SIZE &Size, const tColor *Fg, const string &Text, const cFont *Font, int Align); + void DrawScrolltext(const POINT &Pos, const SIZE &Size, const tColor *Fg, const string &Text, const cFont *Font, int Align); + void DrawScrollbar(const POINT &Pos, const SIZE &Size, int Offset, int Shown, int Total, const tColor *Bg, const tColor *Fg); // displays a full item void DisplayItem(cText2SkinItem *Item, const ItemData *Data = NULL); @@ -149,14 +151,13 @@ protected: tColor *ItemFg(cText2SkinItem *Item); tColor *ItemBg(cText2SkinItem *Item); int GetEditableWidth(MenuItem Item, bool Current); - void TriggerUpdate(void) { mDoUpdate.Broadcast(); } void Update(void); public: cText2SkinRender(cText2SkinLoader *Loader, eSkinSection Section); virtual ~cText2SkinRender(); - void Flush(void) { TriggerUpdate(); } + void Flush(void) { Lock(); mDoUpdate.Broadcast(); Unlock(); } }; #endif // VDR_TEXT2SKIN_RENDER_H -- cgit v1.2.3