summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dummygrid.c7
-rw-r--r--epggrid.c11
-rw-r--r--themes/tvguide-darkblue.theme1
-rw-r--r--themes/tvguide-default.theme1
-rw-r--r--themes/tvguide-nOpacity.theme1
-rw-r--r--themes/tvguide-nOpacitydarkred.theme1
-rw-r--r--themes/tvguide-nOpacitygreen.theme1
-rw-r--r--themes/tvguide-nOpacityiceblue.theme7
-rw-r--r--tvguideosd.c1
9 files changed, 20 insertions, 11 deletions
diff --git a/dummygrid.c b/dummygrid.c
index 0c3ca20..85e75b9 100644
--- a/dummygrid.c
+++ b/dummygrid.c
@@ -57,23 +57,24 @@ void cDummyGrid::setText() {
}
void cDummyGrid::drawText() {
+ tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);
if (tvguideConfig.displayMode == eVertical) {
if (Height()/tvguideConfig.minutePixel < 6)
return;
int textHeight = tvguideConfig.FontGrid->Height();
int textLines = text->Lines();
for (int i=0; i<textLines; i++) {
- pixmap->DrawText(cPoint(borderWidth, borderWidth + i*textHeight), text->GetLine(i), theme.Color(clrFont), clrTransparent, tvguideConfig.FontGrid);
+ pixmap->DrawText(cPoint(borderWidth, borderWidth + i*textHeight), text->GetLine(i), colorText, clrTransparent, tvguideConfig.FontGrid);
}
} else if (tvguideConfig.displayMode == eHorizontal) {
if (Width()/tvguideConfig.minutePixel < 10) {
int titleY = (tvguideConfig.rowHeight - tvguideConfig.FontGridHorizontal->Height())/2;
- pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", theme.Color(clrFont), clrTransparent, tvguideConfig.FontGridHorizontal);
+ pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", colorText, clrTransparent, tvguideConfig.FontGridHorizontal);
return;
}
int titleY = (tvguideConfig.rowHeight - tvguideConfig.FontGridHorizontal->Height())/2;
- pixmap->DrawText(cPoint(borderWidth, titleY), *strText, theme.Color(clrFont), clrTransparent, tvguideConfig.FontGridHorizontal);
+ pixmap->DrawText(cPoint(borderWidth, titleY), *strText, colorText, clrTransparent, tvguideConfig.FontGridHorizontal);
}
}
cString cDummyGrid::getText(void) {
diff --git a/epggrid.c b/epggrid.c
index ab7a650..ac6649e 100644
--- a/epggrid.c
+++ b/epggrid.c
@@ -71,20 +71,21 @@ void cEpgGrid::setText() {
}
void cEpgGrid::drawText() {
+ tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);
if (tvguideConfig.displayMode == eVertical) {
if (Height()/tvguideConfig.minutePixel < 6)
return;
int textHeight = tvguideConfig.FontGrid->Height();
int textLines = text->Lines();
for (int i=0; i<textLines; i++) {
- pixmap->DrawText(cPoint(borderWidth, borderWidth + i*textHeight), text->GetLine(i), theme.Color(clrFont), clrTransparent, tvguideConfig.FontGrid);
+ pixmap->DrawText(cPoint(borderWidth, borderWidth + i*textHeight), text->GetLine(i), colorText, clrTransparent, tvguideConfig.FontGrid);
}
int extTextLines = extText->Lines();
int offset = (textLines+1)*textHeight - 0.5*textHeight;
textHeight = tvguideConfig.FontGridSmall->Height();
if ((Height()-textHeight-10) > offset) {
for (int i=0; i<extTextLines; i++) {
- pixmap->DrawText(cPoint(borderWidth, borderWidth + offset + i*textHeight), extText->GetLine(i), theme.Color(clrFont), clrTransparent, tvguideConfig.FontGridSmall);
+ pixmap->DrawText(cPoint(borderWidth, borderWidth + offset + i*textHeight), extText->GetLine(i), colorText, clrTransparent, tvguideConfig.FontGridSmall);
}
}
if (hasTimer)
@@ -92,13 +93,13 @@ void cEpgGrid::drawText() {
} else if (tvguideConfig.displayMode == eHorizontal) {
if (Width()/tvguideConfig.minutePixel < 10) {
int titleY = (tvguideConfig.rowHeight - tvguideConfig.FontGridHorizontal->Height())/2;
- pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", theme.Color(clrFont), clrTransparent, tvguideConfig.FontGridHorizontal);
+ pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", colorText, clrTransparent, tvguideConfig.FontGridHorizontal);
return;
}
- pixmap->DrawText(cPoint(borderWidth, borderWidth), *timeString, theme.Color(clrFont), clrTransparent, tvguideConfig.FontGridHorizontalSmall);
+ pixmap->DrawText(cPoint(borderWidth, borderWidth), *timeString, colorText, clrTransparent, tvguideConfig.FontGridHorizontalSmall);
cString strTitle = CutText(event->Title(), viewportHeight, tvguideConfig.FontGridHorizontal).c_str();
int titleY = tvguideConfig.FontGridHorizontalSmall->Height() + (tvguideConfig.rowHeight - tvguideConfig.FontGridHorizontalSmall->Height() - tvguideConfig.FontGridHorizontal->Height())/2;
- pixmap->DrawText(cPoint(borderWidth, titleY), *strTitle, theme.Color(clrFont), clrTransparent, tvguideConfig.FontGridHorizontal);
+ pixmap->DrawText(cPoint(borderWidth, titleY), *strTitle, colorText, clrTransparent, tvguideConfig.FontGridHorizontal);
}
}
diff --git a/themes/tvguide-darkblue.theme b/themes/tvguide-darkblue.theme
index 59b3c1b..90285ce 100644
--- a/themes/tvguide-darkblue.theme
+++ b/themes/tvguide-darkblue.theme
@@ -9,6 +9,7 @@ clrGrid2Blending = FF000000
clrHighlight = FF7A6D6D
clrHighlightBlending = FF1C1919
clrFont = FFFFFFFF
+clrFontActive = FFFFFFFF
clrFontHeader = FF000000
clrFontButtons = FFFFFFFF
clrHeader = FF8B9194
diff --git a/themes/tvguide-default.theme b/themes/tvguide-default.theme
index 300d97d..9704e65 100644
--- a/themes/tvguide-default.theme
+++ b/themes/tvguide-default.theme
@@ -9,6 +9,7 @@ clrGrid2Blending = FF000000
clrHighlight = FFFF4D00
clrHighlightBlending = FF000000
clrFont = FFFFFFFF
+clrFontActive = FFFFFFFF
clrFontHeader = FFFFFFFF
clrFontButtons = FFFFFFFF
clrHeader = FF000000
diff --git a/themes/tvguide-nOpacity.theme b/themes/tvguide-nOpacity.theme
index f79e2f8..f492c2d 100644
--- a/themes/tvguide-nOpacity.theme
+++ b/themes/tvguide-nOpacity.theme
@@ -9,6 +9,7 @@ clrGrid2Blending = 90000000
clrHighlight = EE0033FF
clrHighlightBlending = DD000000
clrFont = FFFFFFFF
+clrFontActive = FFFFFFFF
clrFontHeader = FFFFFFFF
clrFontButtons = FFFFFFFF
clrHeader = EE888888
diff --git a/themes/tvguide-nOpacitydarkred.theme b/themes/tvguide-nOpacitydarkred.theme
index afc686e..d0c73a0 100644
--- a/themes/tvguide-nOpacitydarkred.theme
+++ b/themes/tvguide-nOpacitydarkred.theme
@@ -9,6 +9,7 @@ clrGrid2Blending = 90000000
clrHighlight = DDBB0000
clrHighlightBlending = DD000000
clrFont = FFFFFFFF
+clrFontActive = FFFFFFFF
clrFontHeader = FFFFFFFF
clrFontButtons = FFFFFFFF
clrHeader = EE888888
diff --git a/themes/tvguide-nOpacitygreen.theme b/themes/tvguide-nOpacitygreen.theme
index 8c647b0..e787d15 100644
--- a/themes/tvguide-nOpacitygreen.theme
+++ b/themes/tvguide-nOpacitygreen.theme
@@ -9,6 +9,7 @@ clrGrid2Blending = 90000000
clrHighlight = EE006600
clrHighlightBlending = 22000000
clrFont = FFFFFFFF
+clrFontActive = FFFFFFFF
clrFontHeader = FFFFFFFF
clrFontButtons = FFFFFFFF
clrHeader = EE888888
diff --git a/themes/tvguide-nOpacityiceblue.theme b/themes/tvguide-nOpacityiceblue.theme
index da0d42f..2112974 100644
--- a/themes/tvguide-nOpacityiceblue.theme
+++ b/themes/tvguide-nOpacityiceblue.theme
@@ -1,17 +1,18 @@
Description = nOpacity IceBlue
-clrDoBlending = FFFFFFFF
+clrDoBlending = 00000000
clrBackground = DDFFFFFF
clrBackgroundOSD = DDFFFFFF
clrGrid1 = BB555555
clrGrid2 = BB888888
clrHighlight = FF000044
clrFont = FF000000
+clrFontActive = FFFFFFFF
clrFontButtons = FFFFFFFF
clrFontHeader = FF000000
clrHeader = FFFFFFFF
clrBorder = FF000000
-clrStatusHeader = 00000000
-clrStatusHeaderBlending = 00000000
+clrStatusHeader = FFFFFFFF
+clrStatusHeaderBlending = FFFFFFFF
clrTimeline1 = FFDDDDDD
clrTimeline1Blending = 00000000
clrTimeline2 = FF000000
diff --git a/tvguideosd.c b/tvguideosd.c
index ccfad87..5ff142a 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -16,6 +16,7 @@ THEME_CLR(theme, clrGrid2Blending, 0xFF000000);
THEME_CLR(theme, clrHighlight, 0xFFFF4D00);
THEME_CLR(theme, clrHighlightBlending, 0xFF000000);
THEME_CLR(theme, clrFont, clrWhite);
+THEME_CLR(theme, clrFontActive, clrWhite);
THEME_CLR(theme, clrFontHeader, clrWhite);
THEME_CLR(theme, clrFontButtons, clrWhite);
THEME_CLR(theme, clrStatusHeader, clrBlack);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 11:14:17 +0000