From 33490ca83038daf6aee214975c0e51c46baca495 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Nov 2012 19:24:33 +0100 Subject: Integrated patches from maverick-me, resolved Tickets 1141, 1143, 1151, 1152 --- displaymenuview.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'displaymenuview.c') diff --git a/displaymenuview.c b/displaymenuview.c index 9bc89d0..abd921c 100644 --- a/displaymenuview.c +++ b/displaymenuview.c @@ -253,13 +253,15 @@ void cNopacityDisplayMenuView::CreateBackgroundImages(int *handleBackgrounds, in imgLoader.DrawBackground(Theme.Color(clrMenuItemHigh), Theme.Color(clrMenuItemHighBlend), menuItemWidthMain-2, menuItemHeightSchedule-2); handleBackgrounds[5] = cOsdProvider::StoreImage(imgLoader.GetImage()); - imgLoader.DrawBackground(Theme.Color(clrMenuBack), Theme.Color(clrButtonRed), buttonWidth-4, buttonHeight-4); + tColor lutBg[] = { Theme.Color(clrButtonRed), Theme.Color(clrButtonGreen), Theme.Color(clrButtonYellow), Theme.Color(clrButtonBlue) }; + + imgLoader.DrawBackground(Theme.Color(clrMenuBack), lutBg[Setup.ColorKey0], buttonWidth-4, buttonHeight-4); handleButtons[0] = cOsdProvider::StoreImage(imgLoader.GetImage()); - imgLoader.DrawBackground(Theme.Color(clrMenuBack), Theme.Color(clrButtonGreen), buttonWidth-4, buttonHeight-4); + imgLoader.DrawBackground(Theme.Color(clrMenuBack), lutBg[Setup.ColorKey1], buttonWidth-4, buttonHeight-4); handleButtons[1] = cOsdProvider::StoreImage(imgLoader.GetImage()); - imgLoader.DrawBackground(Theme.Color(clrMenuBack), Theme.Color(clrButtonYellow), buttonWidth-4, buttonHeight-4); + imgLoader.DrawBackground(Theme.Color(clrMenuBack), lutBg[Setup.ColorKey2], buttonWidth-4, buttonHeight-4); handleButtons[2] = cOsdProvider::StoreImage(imgLoader.GetImage()); - imgLoader.DrawBackground(Theme.Color(clrMenuBack), Theme.Color(clrButtonBlue), buttonWidth-4, buttonHeight-4); + imgLoader.DrawBackground(Theme.Color(clrMenuBack), lutBg[Setup.ColorKey3], buttonWidth-4, buttonHeight-4); handleButtons[3] = cOsdProvider::StoreImage(imgLoader.GetImage()); } -- cgit v1.2.3