dedicated theme colors for timer backgrounds in main menu (closes Feature 1463)

7 files changed, 14 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index e23429d..a9b6862 100644
--- a/HISTORY
+++ b/HISTORY
@@ -262,3 +262,5 @@ Version 0.1.4
   different buttons (closes Feature 1462)
 - dedicated theme colors in display channel for current event, current event
   info, next evet and next event info (closes Feature 1466)
+- dedicated theme colors for timer backgrounds in main menu (closes Feature
+  1463)
diff --git a/nopacity.c b/nopacity.c
index fc5c8c9..2d8fb58 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -106,6 +106,8 @@ THEME_CLR(Theme, clrMenuItemHigh,           CLR_TRANSBLACK);
 THEME_CLR(Theme, clrMenuItemHighBlend,      CLR_MENUITEMHIGHBLEND);
 THEME_CLR(Theme, clrSeparatorBorder,        CLR_SEPARATORBORDER);
 THEME_CLR(Theme, clrDiskAlert,              CLR_DISKALERT);
+THEME_CLR(Theme, clrTimersBack,             CLR_MENUITEMHIGHBLEND);
+THEME_CLR(Theme, clrTimersBackBlend,        CLR_TRANSBLACK);
 THEME_CLR(Theme, clrMenuFontHeader,         CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontDate,           CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontDiscUsage,      CLR_WHITE);
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index 963dab7..a160927 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -35,12 +35,14 @@ clrMenuBack = DD000000
 clrMenuBorder = DD8c8c8c
 clrMenuScrollBar = DD8c8c8c
 clrMenuScrollBarBack = 40135474
-clrMenuItem = DD5078ab
+clrMenuItem = DD5078AB
 clrMenuItemBlend = DD000000
 clrMenuItemHigh = DD618A9E
 clrMenuItemHighBlend = EE135474
 clrSeparatorBorder = EE444444
 clrDiskAlert = DDFF0000
+clrTimersBack = DD5078AB
+clrTimersBackBlend = DD000000
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index 7d67607..4596743 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -41,6 +41,8 @@ clrMenuItemHigh = DDBB0000
 clrMenuItemHighBlend = DD000000
 clrSeparatorBorder = EE444444
 clrDiskAlert = DDBB0000
+clrTimersBack = DD000000
+clrTimersBackBlend = DDBB0000
 clrMenuFontHeader = FFCCCCCC
 clrMenuFontDate = FFCCCCCC
 clrMenuFontDiscUsage = FFCCCCCC
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index 2057b87..bf1253c 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -41,6 +41,8 @@ clrMenuItemHigh = 22000000
 clrMenuItemHighBlend = EE006600
 clrSeparatorBorder = EE444444
 clrDiskAlert = DDFF0000
+clrTimersBack = 22000000
+clrTimersBackBlend = EE006600
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index d2ab508..2327a83 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -38,6 +38,7 @@ clrMenuItem = FFB2B2C7
 clrMenuItemHigh = FF000044
 clrSeparatorBorder = EE444444
 clrDiskAlert = DDFF0000
+clrTimersBack = FFB2B2C7
 clrMenuFontHeader = FF000000
 clrMenuFontDate = FF000000
 clrMenuFontDiscUsage = FF000000
diff --git a/timers.c b/timers.c
index a077333..8b73884 100644
--- a/timers.c
+++ b/timers.c
@@ -146,10 +146,10 @@ void cNopacityTimer::Render(void) {
         } else {

             pixmap->Fill(Theme.Color(clrMenuBorder));

             if (config.doBlending) {

-                imgLoader.DrawBackground(Theme.Color(clrMenuItemHighBlend), Theme.Color(clrMenuItemHigh), width-2, height-2);

+                imgLoader.DrawBackground(Theme.Color(clrTimersBack), Theme.Color(clrTimersBackBlend), width-2, height-2);

                 pixmap->DrawImage(cPoint(1,1), imgLoader.GetImage());

             } else {

-                pixmap->DrawRectangle(cRect(1, 1, width-2, height-2), Theme.Color(clrMenuItemHigh));

+                pixmap->DrawRectangle(cRect(1, 1, width-2, height-2), Theme.Color(clrTimersBack));

             } 

         }