diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | baserender.c | 2 | ||||
| -rw-r--r-- | displaymenu.c | 15 | ||||
| -rw-r--r-- | flat.h | 1 |
4 files changed, 16 insertions, 4 deletions
@@ -11,7 +11,7 @@ VDR Plugin 'skinflatplus' Revision History - [fix] fixes in TopBar while icon set - [update] add Patch from MegaV0lt, support for simple aspect & format, new icons - [update] only log not loaded images -- [update] imageloader logging +- [add] theme colors clrMenuTextFixedFont, clrMenuTimerItemDisabledFont, clrMenuTimerItemRecordingFont - [add] add support for menu SetItemChannel - [add] add support for menu SetItemTimer - [add] imagescaler from skin nopacity (thank you!) diff --git a/baserender.c b/baserender.c index 0ab832a4..7b479517 100644 --- a/baserender.c +++ b/baserender.c @@ -125,6 +125,8 @@ void cFlatBaseRender::TopBarSetTitleExtra(cString extra1, cString extra2) { } void cFlatBaseRender::TopBarSetExtraIcon(cString icon) { + if( !strcmp(*icon, "") ) + return; topBarExtraIcon = icon; topBarExtraIconSet = true; topBarUpdateTitle = true; diff --git a/displaymenu.c b/displaymenu.c index a2358515..5e7d2031 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -880,6 +880,7 @@ void cFlatDisplayMenu::DrawItemExtraEvent(const cEvent *Event, cString EmptyText bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current, bool Selectable) { if( Config.MenuTimerView == 0 || !Timer ) return false; + dsyslog("SetItemTimer View: %d", Config.MenuTimerView); const cChannel *Channel = Timer->Channel(); const cEvent *Event = Timer->Event(); @@ -912,6 +913,7 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current } } + dsyslog("ItemWidth: %d ItemHeight: %d", menuItemWidth, Height); menuPixmap->DrawRectangle(cRect(Config.decorBorderMenuItemSize, y, menuItemWidth, Height), ColorBg); int Left, Top; @@ -1002,6 +1004,11 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current else File = Timer->File(); + dsyslog("day: %s", *day); + dsyslog("name: %s", *name); + dsyslog("File: %s", File); + dsyslog("Left: %d Top: %d", Left, Top); + if( Config.MenuTimerView == 1 ) { buffer = cString::sprintf("%s%s%s %02d:%02d %02d:%02d %s", *name, *name && **name ? " " : "", *day, @@ -1503,12 +1510,14 @@ void cFlatDisplayMenu::SetText(const char *Text, bool FixedFont) { Width -= scrollBarWidth; } - if( FixedFont ) + if( FixedFont ) { ContentCreate(Left, Top, Width, Height, 1); - else + ContentSet( Text, Theme.Color(clrMenuTextFixedFont), Theme.Color(clrMenuTextBg) ); + } else { ContentCreate(Left, Top, Width, Height, 1); + ContentSet( Text, Theme.Color(clrMenuTextFont), Theme.Color(clrMenuTextBg) ); + } - ContentSet( Text, Theme.Color(clrMenuTextFont), Theme.Color(clrMenuTextBg) ); if( ContentScrollable() ) DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal()); @@ -102,6 +102,7 @@ THEME_CLR(Theme, clrMenuRecFontInfo, 0xFFEEEEEE); // Menu Text (Multiline) THEME_CLR(Theme, clrMenuTextBg, 0xC0101010); THEME_CLR(Theme, clrMenuTextFont, 0xFFEEEEEE); +THEME_CLR(Theme, clrMenuTextFixedFont, 0xFFEEEEEE); THEME_CLR(Theme, clrMenuContentHeadBorderFg, 0xC03090B0); THEME_CLR(Theme, clrMenuContentHeadBorderBg, 0xC03090B0); |