diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-08-07 13:47:52 +0200 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-09-01 15:33:34 +0200 |
| commit | 9dc475aa0ffdbeac344c84588ae820789c255362 (patch) | |
| tree | 70afcf4c6650dcc65958b2dd55c7e4252dcd3e48 | |
| parent | 87a883907d19845544efad4003b122219e0a9ec7 (diff) | |
| download | skin-lcarsng-9dc475aa0ffdbeac344c84588ae820789c255362.tar.gz skin-lcarsng-9dc475aa0ffdbeac344c84588ae820789c255362.tar.bz2 | |
Optical changes to cLCARSNGDisplayMessage
| -rw-r--r-- | displaymessage.c | 21 | ||||
| -rw-r--r-- | themes/lcarsng-meins.theme | 8 |
2 files changed, 17 insertions, 12 deletions
diff --git a/displaymessage.c b/displaymessage.c index e2f07ef..dc4b0e5 100644 --- a/displaymessage.c +++ b/displaymessage.c @@ -11,13 +11,13 @@ cLCARSNGDisplayMessage::cLCARSNGDisplayMessage(void) x0 = 0; x1 = lineHeight / 2; x2 = lineHeight; - x3 = x2 + Gap; + x3 = x2 + Gap + 2 * Margin; x7 = cOsd::OsdWidth(); x6 = x7 - lineHeight / 2; x5 = x6 - lineHeight / 2; - x4 = x5 - Gap; + x4 = x5 - Gap - 2 * Margin;; y0 = 0; - y1 = lineHeight; + y1 = lineHeight + 2 * Margin; osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1, x0, y0, x7 - 1, y1 - 1); } @@ -33,12 +33,17 @@ void cLCARSNGDisplayMessage::SetMessage(eMessageType Type, const char *Text) tColor ColorBg = Theme.Color(clrMessageStatusBg + 2 * Type); osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, Theme.Color(clrBackground)); osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent); - osd->DrawEllipse (x0, y0, x1 - 1, y1 - 1, ColorBg, 7); - osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, ColorBg); - osd->DrawText(x3, y0, Text, ColorFg, ColorBg, cFont::GetFont(fontSml), x4 - x3, y1 - y0, taCenter); - osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, ColorBg); + osd->DrawEllipse (x0, y0, x1 - 1, y1 - 1, ColorFg, 7); + osd->DrawEllipse (x0 + Margin, y0 + Margin, x1 - 1, y1 - 1 - Margin, ColorBg, 7); + DrawRectangleOutline(osd, x1, y0, x2 - 1, y1 - 1, ColorFg, ColorBg, 14); + DrawRectangleOutline(osd, x3 - Margin, y0, x4 - 1 + Margin, y1 - 1, ColorFg, ColorBg, 15); + int w = cFont::GetFont(fontSml)->Width(Text); + int x = (x4 -x3 - w) / 2; + osd->DrawText(x3 + x + Margin, y0 + Margin, Text, ColorFg, ColorBg, cFont::GetFont(fontSml), w, y1 - y0 - 2 * Margin, taCenter); + DrawRectangleOutline(osd, x5, y0, x6 - 1, y1 - 1, ColorFg, ColorBg, 11); osd->DrawRectangle(x6, y0, x7 - 1, y1 - 1, clrTransparent); - osd->DrawEllipse (x6, y0, x7 - 1, y1 - 1, ColorBg, 5); + osd->DrawEllipse (x6, y0, x7 - 1, y1 - 1, ColorFg, 5); + osd->DrawEllipse (x6, y0 + Margin, x7 - 1 - Margin, y1 - 1 - Margin, ColorBg, 5); } void cLCARSNGDisplayMessage::Flush(void) diff --git a/themes/lcarsng-meins.theme b/themes/lcarsng-meins.theme index 7b69b8b..29a52b6 100644 --- a/themes/lcarsng-meins.theme +++ b/themes/lcarsng-meins.theme @@ -27,10 +27,10 @@ clrButtonBlueFg = FF000000 clrButtonBlueBg = FF9A99FF clrMessageStatusFg = FFFFFFFF clrMessageStatusBg = FF9A99FF -clrMessageInfoFg = FF000000 -clrMessageInfoBg = FFA0FF99 -clrMessageWarningFg = FF000000 -clrMessageWarningBg = FFF1DF60 +clrMessageInfoFg = FFA0FF99 +clrMessageInfoBg = 99404040 +clrMessageWarningFg = FFF1DF60 +clrMessageWarningBg = 99404040 clrMessageErrorFg = FFFFFFFF clrMessageErrorBg = FFCC6666 clrVolumeFrame = FFF1DF6F |