diff options
| author | Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu> | 2014-02-09 16:57:17 +0100 |
|---|---|---|
| committer | Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu> | 2014-02-09 16:57:17 +0100 |
| commit | db8c047fc6af3c87ebd7284d8e90a5cd90602c4f (patch) | |
| tree | e7777c0f165827957436c795138714004a409258 | |
| parent | 8daa7fb9904bc5f594569329dc539bf443e07a8f (diff) | |
| download | skin-flatplus-db8c047fc6af3c87ebd7284d8e90a5cd90602c4f.tar.gz skin-flatplus-db8c047fc6af3c87ebd7284d8e90a5cd90602c4f.tar.bz2 | |
fix menu item-progressbar overlay item-text
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | baserender.c | 4 | ||||
| -rw-r--r-- | displaymenu.c | 7 |
3 files changed, 8 insertions, 5 deletions
@@ -7,7 +7,9 @@ VDR Plugin 'skinflatplus' Revision History - [fix] menu scrollbar size and margin - [fix] no scrollbar in some situations - [fix] remove button border if button is not shown +- [fix] menuitem progressbar overlay itemtext - [add] add support for menu SetItemChannel +- [add] add support for menu SetItemTimer - [update] add Patch from MegaV0lt, support for simple aspect & format, new icons - [update] only log not loaded images diff --git a/baserender.c b/baserender.c index 6d28ba47..f59bd8b9 100644 --- a/baserender.c +++ b/baserender.c @@ -80,11 +80,11 @@ void cFlatBaseRender::CreateOsd(int left, int top, int width, int height) { if (osd) { tArea Area = { 0, 0, width, height, 32 }; if (osd->SetAreas(&Area, 1) == oeOk) { - dsyslog("skinflatplus: create osd SUCESS left: %d top: %d width: %d height: %d", left, top, width, height); + dsyslog("skinflatplus: create osd SUCCESS left: %d top: %d width: %d height: %d", left, top, width, height); return; } } - dsyslog("skinflatplus: create osd FAILED left: %d top: %d width: %d height: %d", left, top, width, height); + esyslog("skinflatplus: create osd FAILED left: %d top: %d width: %d height: %d", left, top, width, height); return; } diff --git a/displaymenu.c b/displaymenu.c index 8b0bb392..e6cf48d6 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -297,6 +297,9 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S bool isRunning = false; int xt = Tab(i); + int xt2 = Tab(i+1); + if( xt2 == 0 ) + xt2 = menuItemWidth; if( xt >= menuItemWidth ) continue; @@ -389,7 +392,6 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S xt + Config.decorBorderMenuItemSize, colWidth, s, ColorFg, ColorBarFg, ColorBg); } else { if( (menuCategory == mcMain || menuCategory == mcSetup) && Config.MenuItemIconsShow) { - cString cIcon = GetIconName( MainMenuText(s) ); cImageLoader imgLoader; if (imgLoader.LoadIcon(*cIcon, fontHeight -marginItem*2)) { @@ -402,8 +404,7 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S menuPixmap->DrawText(cPoint(fontHeight + marginItem*2 + xt + Config.decorBorderMenuItemSize, y), s, ColorFg, ColorBg, font, AvailableTextWidth - xt - marginItem*2 - fontHeight); } else { - menuPixmap->DrawText(cPoint(xt + Config.decorBorderMenuItemSize, y), s, ColorFg, ColorBg, font, - AvailableTextWidth - xt); + menuPixmap->DrawText(cPoint(xt + Config.decorBorderMenuItemSize, y), s, ColorFg, ColorBg, font, xt2 - xt); } } } |