Set the highligcolor for Bay Buttons

Removed SetHighlightedBackgroundBitmap at all places (N_SE-42436) . Set the focusable true for context menu

Change-Id: I2f721b99588586f11d0d23c8c035ee5e3a1a05f9
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>

diff --git a/src/ClDayPanel.cpp b/src/ClDayPanel.cpp
index e5940f5..95ff138 100644 (file)
--- a/src/ClDayPanel.cpp
+++ b/src/ClDayPanel.cpp
@@ -942,7 +942,6 @@ DayEventPanel::InitializeAllDayEventList(void)
        pButton->AddActionEventListener(*this);
        pButton->SetNormalBackgroundBitmap(*ResourceManager::GetBlankBitmap());
        pButton->SetPressedBackgroundBitmap(*ResourceManager::GetBlankBitmap());
-       pButton->SetHighlightedBackgroundBitmap(*ResourceManager::GetBlankBitmap());
        pButton->SetTextSize(FONT_SIZE_ALL_DAY_EVENT_EXPAND);
        pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        pButton->SetTextColor(Color(COLOR_ALL_DAY_EVENT));

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 632a487..c025e69 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -1327,7 +1327,6 @@ EventEditorForm::CreateReminderItemN(int itemWidth, int itemHeight, const String
        if (pBitmapBgDeletePressed != null)
        {
                pButtonDeleteReminder->SetPressedBackgroundBitmap(*pBitmapBgDeletePressed);
-               pButtonDeleteReminder->SetHighlightedBackgroundBitmap(*pBitmapBgDeletePressed);
                delete pBitmapBgDeletePressed;
        }
        Bitmap* pBitmapMinus = ResourceManager::GetBitmapN(IDB_BUTTON_MINUS);
@@ -1366,7 +1365,6 @@ EventEditorForm::CreateReminderItemN(int itemWidth, int itemHeight, const String
                if (pBitmapBgButtonPressed != null)
                {
                        pButtonAddReminder->SetPressedBackgroundBitmap(*pBitmapBgButtonPressed);
-                       pButtonAddReminder->SetHighlightedBackgroundBitmap(*pBitmapBgButtonPressed);
                        delete pBitmapBgButtonPressed;
                }
                Bitmap* pBitmapPlus = ResourceManager::GetBitmapN(IDB_BUTTON_PLUS);

diff --git a/src/ClMainForm.cpp b/src/ClMainForm.cpp
index f01dcf0..ce77c0e 100644 (file)
--- a/src/ClMainForm.cpp
+++ b/src/ClMainForm.cpp
@@ -101,6 +101,7 @@ MainForm::InitializeViewMenu(void)
        __pContextMenuView = new (std::nothrow) ContextMenu();
        __pContextMenuView->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
        __pContextMenuView->AddActionEventListener(*this);
+       __pContextMenuView->SetFocusable(true);
 
        Rectangle bounds = GetHeader()->GetButtonBounds(BUTTON_POSITION_RIGHT);
        Point point = GetHeader()->ConvertToScreenPosition(Point(bounds.x, bounds.y));

diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp
index b7a02eb..c3c871a 100644 (file)
--- a/src/ClMonthPanel.cpp
+++ b/src/ClMonthPanel.cpp
@@ -193,10 +193,12 @@ DayButton::SetDate(const DateTime& date)
        {
                SetTextColor(Color((__isFocused == true) ? COLOR_DAY_FOCUS : COLOR_DAY_SUN));
                SetDisabledTextColor(Color(COLOR_DAY_SUN_DIM));
+               SetHighlightedTextColor(Color((__isFocused == true) ? COLOR_DAY_FOCUS : COLOR_DAY_SUN));
        }
        else
        {
                SetTextColor(Color((__isFocused == true) ? COLOR_DAY_FOCUS : COLOR_DAY));
+               SetHighlightedTextColor(Color((__isFocused == true) ? COLOR_DAY_FOCUS : COLOR_DAY));
                SetDisabledTextColor(Color(COLOR_DAY_DIM));
        }
 }
@@ -314,7 +316,6 @@ DayButton::OnInitializing(void)
 {
        SetNormalBackgroundBitmap(*ResourceManager::GetBlankBitmap());
        SetPressedBackgroundBitmap(*ResourceManager::GetBlankBitmap());
-       SetHighlightedBackgroundBitmap(*ResourceManager::GetBlankBitmap());
 
        Bitmap* pPressedBitmap = ResourceManager::GetBitmapN(IDB_MONTH_VIEW_DAY_PRESS);
        if (pPressedBitmap)
@@ -326,7 +327,6 @@ DayButton::OnInitializing(void)
        SetTextSize(FONT_SIZE_DAY);
        SetTextColor(Color(COLOR_DAY));
        SetPressedTextColor(Color(COLOR_DAY_FOCUS));
-       SetHighlightedTextColor(Color(COLOR_DAY_FOCUS));
        SetDisabledTextColor(Color(COLOR_DAY_DIM));
 
        AddActionEventListener(*this);

diff --git a/src/ClYearPanel.cpp b/src/ClYearPanel.cpp
index a89ba8a..188c136 100644 (file)
--- a/src/ClYearPanel.cpp
+++ b/src/ClYearPanel.cpp
@@ -291,7 +291,6 @@ CalendarPanel::OnInitializing(void)
 
                __pMonthCalendars[month]->SetNormalBackgroundBitmap(*ResourceManager::GetBlankBitmap());
                __pMonthCalendars[month]->SetPressedBackgroundBitmap(*ResourceManager::GetBlankBitmap());
-               __pMonthCalendars[month]->SetHighlightedBackgroundBitmap(*ResourceManager::GetBlankBitmap());
                __pMonthCalendars[month]->SetActionId(month + 1);
                __pMonthCalendars[month]->AddActionEventListener(*this);
                AddControl(__pMonthCalendars[month]);