From 742ec7c1d72dd530bd40be51eb690fb0a37e6dc9 Mon Sep 17 00:00:00 2001 From: Martin Schirrmacher Date: Fri, 4 Apr 2014 20:30:38 +0200 Subject: fix SetRecording border with deleteresume.patch --- HISTORY | 2 ++ baserender.h | 31 ++++++++++++++++--------------- displaymenu.c | 6 +++--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/HISTORY b/HISTORY index 26ab708b..88fa9d72 100644 --- a/HISTORY +++ b/HISTORY @@ -2,6 +2,8 @@ VDR Plugin 'skinflatplus' Revision History --------------------------------------- 2014-XX-XX: Version 0.3.0 +- [fix] SetRecording border with deleteresume.patch +- [fix] recording menu with cutted recordings an % - [update] channel logo in wide format (like 3PO or creimer logos) - [add] TVScraper support - [add] more options to show disk usage (not show; timer & recording menu; always on the menu; always show) diff --git a/baserender.h b/baserender.h index 947533a2..59079879 100644 --- a/baserender.h +++ b/baserender.h @@ -11,7 +11,8 @@ enum eBorder { BorderMessage, BorderButton, BorderContent, - BorderTVSPoster + BorderTVSPoster, + BorderSetRecording }; struct sDecorBorder { @@ -27,7 +28,7 @@ class cFlatBaseRender int osdLeft, osdTop, osdWidth, osdHeight; int marginItem; - + // Standard fonts cFont *font; cFont *fontSml; @@ -42,7 +43,7 @@ class cFlatBaseRender cPixmap *topBarIconBGPixmap; cFont *topBarFont, *topBarFontSml; int topBarFontHeight, topBarFontSmlHeight; - + cString topBarTitle; cString tobBarTitleExtra1, tobBarTitleExtra2; cString topBarExtraIcon; @@ -51,7 +52,7 @@ class cFlatBaseRender bool topBarMenuIconSet; cString topBarMenuLogo; bool topBarMenuLogoSet; - + bool topBarUpdateTitle; cString topBarLastDate; int topBarHeight; @@ -66,16 +67,16 @@ class cFlatBaseRender bool progressBarIsSignal; tColor progressBarColorFg, progressBarColorBarFg, progressBarColorBarCurFg, progressBarColorBg; tColor progressBarColorMark, progressBarColorMarkCurrent; - + // Scrollbar int scrollBarWidth; - + // Buttons rot, grün, gelb, blau cPixmap *buttonsPixmap; int buttonsWidth, buttonsHeight, buttonsTop; int marginButtonColor, buttonColorHeight; bool buttonsDrawn; - + // Nachricht cPixmap *messagePixmap; int messageWidth, messageHeight; @@ -88,7 +89,7 @@ class cFlatBaseRender bool contentHasScrollbar; bool contentShown; int contentFontType; - + tColor contentColorFg, contentColorBg; cTextWrapper contentWrapper; @@ -103,17 +104,17 @@ class cFlatBaseRender void DecorDrawGlowRectHor(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg); void DecorDrawGlowRectVer(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg); - + void DecorDrawGlowRectTL(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg); void DecorDrawGlowRectTR(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg); void DecorDrawGlowRectBL(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg); void DecorDrawGlowRectBR(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg); - + void DecorDrawGlowEllipseTL(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg, int type); void DecorDrawGlowEllipseTR(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg, int type); void DecorDrawGlowEllipseBL(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg, int type); void DecorDrawGlowEllipseBR(cPixmap *pixmap, int Left, int Top, int Width, int Height, tColor ColorBg, int type); - + void TopBarEnableDiskUsage(void); //tColor Multiply(tColor Color, uint8_t Alpha); tColor SetAlpha(tColor Color, double am); @@ -137,7 +138,7 @@ class cFlatBaseRender void ButtonsCreate(void); void ButtonsSet(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL); bool ButtonsDrawn(void); - + void MessageCreate(void); void MessageSet(eMessageType Type, const char *Text); void MessageClear(void); @@ -150,13 +151,13 @@ class cFlatBaseRender void ScrollbarDraw(cPixmap *Pixmap, int Left, int Top, int Height, int Total, int Offset, int Shown, bool CanScrollUp, bool CanScrollDown); int ScrollBarWidth(void); - + /* int FontType * 0 = NormalFont * 1 = FixedFont * 2 = SmallFont */ - + void ContentCreate(int Left, int Top, int Width, int Height, int FontType); void ContentSet(const char *Text, tColor ColorFg, tColor ColorBg); bool ContentIsShown(void); @@ -169,7 +170,7 @@ class cFlatBaseRender int ContentGetTextHeight(void); bool ContentScroll(bool Up, bool Page); void ContentClear(void); - + void DecorBorderDraw(int Left, int Top, int Width, int Height, int Size, int Type, tColor ColorFg, tColor ColorBg, int From = 0, bool Store = true); void DecorBorderClear(int Left, int Top, int Width, int Height, int Size); void DecorBorderClearAll(void); diff --git a/displaymenu.c b/displaymenu.c index 54c79e91..ae5ea219 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -2240,7 +2240,7 @@ void cFlatDisplayMenu::SetRecording(const cRecording *Recording) { contentHeadPixmap->DrawText(cPoint(marginItem, marginItem + fontSmlHeight + fontHeight), shortText, Theme.Color(clrMenuRecFontInfo), Theme.Color(clrMenuRecBg), fontSml, menuWidth - marginItem*2); DecorBorderDraw(chLeft, chTop, chWidth, chHeight, Config.decorBorderMenuContentHeadSize, Config.decorBorderMenuContentHeadType, - Config.decorBorderMenuContentHeadFg, Config.decorBorderMenuContentHeadBg); + Config.decorBorderMenuContentHeadFg, Config.decorBorderMenuContentHeadBg, BorderSetRecording, false); ContentSet( text.str().c_str(), Theme.Color(clrMenuRecFontInfo), Theme.Color(clrMenuRecBg) ); if( ContentScrollable() ) { @@ -2260,11 +2260,11 @@ void cFlatDisplayMenu::SetRecording(const cRecording *Recording) { if( Config.MenuContentFullSize || ContentScrollable() ) DecorBorderDraw(RecordingBorder.Left, RecordingBorder.Top, RecordingBorder.Width, RecordingBorder.Height, RecordingBorder.Size, RecordingBorder.Type, - RecordingBorder.ColorFg, RecordingBorder.ColorBg, RecordingBorder.From); + RecordingBorder.ColorFg, RecordingBorder.ColorBg, RecordingBorder.From, false); else DecorBorderDraw(RecordingBorder.Left, RecordingBorder.Top, RecordingBorder.Width, ContentGetTextHeight(), RecordingBorder.Size, RecordingBorder.Type, - RecordingBorder.ColorFg, RecordingBorder.ColorBg, RecordingBorder.From); + RecordingBorder.ColorFg, RecordingBorder.ColorBg, RecordingBorder.From, false); } void cFlatDisplayMenu::SetText(const char *Text, bool FixedFont) { -- cgit v1.2.3