Now using more separate areas in the "ST:TNG Panels" skin

This commit is contained in:
Klaus Schmidinger 2004-05-29 09:59:45 +02:00
parent 59d03df391
commit 1924da2cfe
2 changed files with 10 additions and 13 deletions

View File

@ -2851,3 +2851,5 @@ Video Disk Recorder Revision History
- Fixed setting the title in the replay display of the "Classic VDR" skin in case - Fixed setting the title in the replay display of the "Classic VDR" skin in case
a shorter title is set after a longer one (thanks to Stefan Huelswitt for a shorter title is set after a longer one (thanks to Stefan Huelswitt for
reporting this one). reporting this one).
- Now using more separate areas in the "ST:TNG Panels" skin to allow a theme to
use more independent clrMenu* colors.

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: skinsttng.c 1.2 2004/05/22 13:05:07 kls Exp $ * $Id: skinsttng.c 1.3 2004/05/29 09:56:22 kls Exp $
*/ */
// Star Trek: The Next Generation® is a registered trademark of Paramount Pictures // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures
@ -324,12 +324,12 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
message = false; message = false;
x0 = 0; x0 = 0;
x1 = lineHeight / 2; x1 = lineHeight / 2;
x2 = x1 + Roundness; x3 = (x1 + Roundness + Gap + 7) & ~0x07; // must be multiple of 8
x3 = x2 + Gap; x2 = x3 - Gap;
x7 = Setup.OSDWidth; x7 = Setup.OSDWidth;
x6 = x7 - lineHeight / 2; x6 = x7 - lineHeight / 2;
x5 = x6 - lineHeight / 2; x4 = (x6 - lineHeight / 2 - Gap) & ~0x07; // must be multiple of 8
x4 = x5 - Gap; x5 = x4 + Gap;
y0 = 0; y0 = 0;
y1 = lineHeight; y1 = lineHeight;
y2 = y1 + Roundness; y2 = y1 + Roundness;
@ -345,18 +345,13 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk) if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea)); osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
else { else {
tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 },
{ x0, y1, x7 - 1, y6 - 1, 2 },
{ x0, y6, x7 - 1, y7 - 1, 4 }
};
osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
/*TODO
tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 }, tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
{ x0, y3, x3 - 1, y4 - 1, 1 }, { x0, y3, x3 - 1, y4 - 1, 1 },
{ x3, y3, x5 - 1, y4 - 1, 2 }, { x3, y3, x4 - 1, y4 - 1, 2 },
{ x4, y3, x7 - 1, y4 - 1, 2 },
{ x0, y4, x7 - 1, y7 - 1, 4 } { x0, y4, x7 - 1, y7 - 1, 4 }
}; };
*/ osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
} }
osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground)); osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent); osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);