frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed possible garbage in the remaining time of the LCARS replay display in case the hours change from two to one digit

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-01-23 14:05:03 +01:00
parent b833de1761
commit 8281be1480
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -7539,3 +7539,5 @@ Video Disk Recorder Revision History
- Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch). - Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch).
- Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly). - Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly).
- The LCARS menu now also works if the OSD has only 1bpp (two colors). - The LCARS menu now also works if the OSD has only 1bpp (two colors).
- Fixed possible garbage in the remaining time of the LCARS replay display in case the
hours change from two to one digit.

11
skinlcars.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: skinlcars.c 2.16 2013/01/23 13:34:12 kls Exp $ * $Id: skinlcars.c 2.17 2013/01/23 14:00:09 kls Exp $
*/ */
// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@ -1680,6 +1680,7 @@ private:
int lineHeight; int lineHeight;
tColor frameColor; tColor frameColor;
int lastCurrentWidth; int lastCurrentWidth;
int lastTotalWidth;
cString lastDate; cString lastDate;
tTrackId lastTrackId; tTrackId lastTrackId;
void DrawDate(void); void DrawDate(void);
@ -1705,6 +1706,7 @@ cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly)
lineHeight = font->Height(); lineHeight = font->Height();
frameColor = Theme.Color(clrReplayFrameBg); frameColor = Theme.Color(clrReplayFrameBg);
lastCurrentWidth = 0; lastCurrentWidth = 0;
lastTotalWidth = 0;
int d = 5 * lineHeight; int d = 5 * lineHeight;
xp00 = 0; xp00 = 0;
xp01 = xp00 + d / 2; xp01 = xp00 + d / 2;
@ -1822,15 +1824,16 @@ void cSkinLCARSDisplayReplay::SetCurrent(const char *Current)
{ {
const cFont *font = cFont::GetFont(fontOsd); const cFont *font = cFont::GetFont(fontOsd);
int w = font->Width(Current); int w = font->Width(Current);
osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : w, 0, taLeft); osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, max(lastCurrentWidth, w), 0, taLeft);
lastCurrentWidth = w; lastCurrentWidth = w;
} }
void cSkinLCARSDisplayReplay::SetTotal(const char *Total) void cSkinLCARSDisplayReplay::SetTotal(const char *Total)
{ {
const cFont *font = cFont::GetFont(fontOsd); const cFont *font = cFont::GetFont(fontOsd);
int w = font->Width(Total) + 10; int w = font->Width(Total);
osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taRight); osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, max(lastTotalWidth, w), 0, taRight);
lastTotalWidth = w;
} }
void cSkinLCARSDisplayReplay::SetJump(const char *Jump) void cSkinLCARSDisplayReplay::SetJump(const char *Jump)