display not selectable menu elements with dedicated font color

2 files changed, 11 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 39f33de..a3b3f19 100644
--- a/HISTORY
+++ b/HISTORY
@@ -336,3 +336,4 @@ Version 0.1.4
 - Added background with dedicated theme color for channel logos in menus
 - Improved Display of Poster or Banner in displaychannel
 - implemented cDisplayChannel::SetMessage()
+- display not selectable menu elements with dedicated font color
diff --git a/menuitem.c b/menuitem.c
index ce3cbb8..b588d54 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -1547,8 +1547,7 @@ bool cNopacityDefaultMenuItem::DrawHeaderElement(void) {
         *(c2 + 1) = 0;
 
         int left = 5 + tabWidth[0];
-        tColor clrFontBack = (config.GetValue("displayType") != dtFlat)?(clrTransparent):((current)?Theme.Color(clrMenuItemHigh):Theme.Color(clrMenuItem));
-	pixmapStatic->DrawText(cPoint(left, (height - font->Height()) / 2), c, Theme.Color(clrMenuFontMenuItemSep), clrFontBack, font);
+        pixmapStatic->DrawText(cPoint(left, (height - font->Height()) / 2), c, Theme.Color(clrMenuFontMenuItemSep), clrTransparent, font);
         return true;
     }
     return false;
@@ -1557,7 +1556,15 @@ bool cNopacityDefaultMenuItem::DrawHeaderElement(void) {
 void cNopacityDefaultMenuItem::Render() {
     DrawBackground();
     pixmapStatic->Fill(clrTransparent);
-    tColor clrFont = (current)?Theme.Color(clrMenuFontMenuItemHigh):Theme.Color(clrMenuFontMenuItem);
+    
+    tColor clrFont;
+    if (current)
+        clrFont = Theme.Color(clrMenuFontMenuItemHigh);
+    else if (!selectable)
+        clrFont = Theme.Color(clrMenuFontMenuItemSep);
+    else
+        clrFont = Theme.Color(clrMenuFontMenuItem);
+
     if (!selectable && (strncmp(Text, "---", 3) == 0)) {
         if (DrawHeaderElement())
             return;