added dedicated font background color for grids in graphical themes to avoid font pixelation

11 files changed, 32 insertions, 2 deletions

diff --git a/config.h b/config.h
index d4390cd..6d3c33d 100644
--- a/config.h
+++ b/config.h
@@ -199,6 +199,8 @@ THEME_CLR(theme, clrGrid2, 0x00000000);
 THEME_CLR(theme, clrGrid2Blending, 0x00000000);

 THEME_CLR(theme, clrHighlight, 0xAA3A3A55);

 THEME_CLR(theme, clrHighlightBlending, 0xDD000000);

+THEME_CLR(theme, clrGridFontBack, clrTransparent);

+THEME_CLR(theme, clrGridActiveFontBack, 0xFFAFD533);

 THEME_CLR(theme, clrFont, clrWhite);

 THEME_CLR(theme, clrFontActive, 0xFF363636);

 THEME_CLR(theme, clrFontHeader, 0xFF363636);

diff --git a/dummygrid.c b/dummygrid.c
index 4ab0692..2ab9056 100644
--- a/dummygrid.c
+++ b/dummygrid.c
@@ -66,7 +66,13 @@ void cDummyGrid::setText() {
 
 void cDummyGrid::drawText() {
     tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);
-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+    tColor colorTextBack;
+    if (tvguideConfig.style == eStyleFlat)
+        colorTextBack = color;
+    else if (tvguideConfig.style == eStyleGraphical)
+        colorTextBack = (active)?theme.Color(clrGridActiveFontBack):theme.Color(clrGridFontBack);
+    else
+        colorTextBack = clrTransparent;
     if (tvguideConfig.displayMode == eVertical) {
         if (Height()/geoManager.minutePixel < 6)
             return;
diff --git a/epggrid.c b/epggrid.c
index 2d8a703..7a21834 100644
--- a/epggrid.c
+++ b/epggrid.c
@@ -98,7 +98,13 @@ void cEpgGrid::setText() {
 

 void cEpgGrid::drawText() {

     tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);

-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;

+    tColor colorTextBack;

+    if (tvguideConfig.style == eStyleFlat)

+        colorTextBack = color;

+    else if (tvguideConfig.style == eStyleGraphical)

+        colorTextBack = (active)?theme.Color(clrGridActiveFontBack):theme.Color(clrGridFontBack);

+    else

+        colorTextBack = clrTransparent;

     if (tvguideConfig.displayMode == eVertical) {

         if (Height()/geoManager.minutePixel < 6)

             return;

diff --git a/themes/tvguide-blue.theme b/themes/tvguide-blue.theme
index 25f8bf2..5fd6a9e 100644
--- a/themes/tvguide-blue.theme
+++ b/themes/tvguide-blue.theme
@@ -8,6 +8,8 @@ clrGrid2 = EE888888
 clrGrid2Blending = 90000000
 clrHighlight = EE0033FF
 clrHighlightBlending = DD000000
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrFont = FFFFFFFF
 clrFontActive  = FFFFFFFF
 clrFontHeader = FFFFFFFF
diff --git a/themes/tvguide-darkblue.theme b/themes/tvguide-darkblue.theme
index 7fd6feb..a52303e 100644
--- a/themes/tvguide-darkblue.theme
+++ b/themes/tvguide-darkblue.theme
@@ -8,6 +8,8 @@ clrGrid2 = FF071871
 clrGrid2Blending = FF000000
 clrHighlight = FF7A6D6D
 clrHighlightBlending = FF1C1919
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrFont = FFFFFFFF
 clrFontActive = FFFFFFFF
 clrFontHeader = FF000000
diff --git a/themes/tvguide-darkred.theme b/themes/tvguide-darkred.theme
index a1af3ac..c11d51f 100644
--- a/themes/tvguide-darkred.theme
+++ b/themes/tvguide-darkred.theme
@@ -8,6 +8,8 @@ clrGrid2 = DD333333
 clrGrid2Blending = 90000000
 clrHighlight = DDBB0000
 clrHighlightBlending = DD000000
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrFont = FFFFFFFF
 clrFontActive  = FFFFFFFF
 clrFontHeader = FFFFFFFF
diff --git a/themes/tvguide-darkredNG.theme b/themes/tvguide-darkredNG.theme
index c59363a..2374de8 100644
--- a/themes/tvguide-darkredNG.theme
+++ b/themes/tvguide-darkredNG.theme
@@ -8,6 +8,8 @@ clrGrid2 = DD333333
 clrGrid2Blending = 90000000
 clrHighlight = DDBB0000
 clrHighlightBlending = DD000000
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrFont = FFFFFFFF
 clrFontActive  = FFFFFFFF
 clrFontHeader = FFFFFFFF
diff --git a/themes/tvguide-default.theme b/themes/tvguide-default.theme
index 05f8683..fdc0346 100644
--- a/themes/tvguide-default.theme
+++ b/themes/tvguide-default.theme
@@ -8,6 +8,8 @@ clrGrid2 = 00000000
 clrGrid2Blending = 00000000
 clrHighlight = DD313548
 clrHighlightBlending = DD000000
+clrGridFontBack = 00000000
+clrGridActiveFontBack = FFAFD533
 clrFont = FFFFFFFF
 clrFontActive  = FF363636
 clrFontHeader = FF363636
diff --git a/themes/tvguide-green.theme b/themes/tvguide-green.theme
index e86f512..2fb2734 100644
--- a/themes/tvguide-green.theme
+++ b/themes/tvguide-green.theme
@@ -8,6 +8,8 @@ clrGrid2 = EE888888
 clrGrid2Blending = 90000000
 clrHighlight = EE006600
 clrHighlightBlending = 22000000
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrFont = FFFFFFFF
 clrFontActive  = FFFFFFFF
 clrFontHeader = FFFFFFFF
diff --git a/themes/tvguide-iceblue.theme b/themes/tvguide-iceblue.theme
index 766f77d..218ad20 100644
--- a/themes/tvguide-iceblue.theme
+++ b/themes/tvguide-iceblue.theme
@@ -4,6 +4,8 @@ clrBackground = DDFFFFFF
 clrBackgroundOSD = FFFFFFFF
 clrGrid1 = BB555555
 clrGrid2 = BB888888
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrHighlight = FF000044
 clrFont = FF000000
 clrFontActive  = FFFFFFFF
diff --git a/themes/tvguide-keepitsimple.theme b/themes/tvguide-keepitsimple.theme
index e329523..5d7e560 100644
--- a/themes/tvguide-keepitsimple.theme
+++ b/themes/tvguide-keepitsimple.theme
@@ -4,6 +4,8 @@ clrBackground = FF111111
 clrBackgroundOSD = FF111111
 clrGrid1 = BB555555
 clrGrid2 = BB888888
+clrGridFontBack = 00000000
+clrGridActiveFontBack = 00000000
 clrHighlight = FF336699
 clrFont = FFFFFFFF
 clrFontActive  = FFFFFFFF