From a29d030621d2da044a88498d86e4de5b54a743e7 Mon Sep 17 00:00:00 2001 From: Gaurav Bhatt Date: Thu, 12 Sep 2013 18:50:03 +0530 Subject: [PATCH] Fix for N_SE-51637,N_SE-51981,N_SE-52072,N_SE-51821 Change-Id: I08b9ac62111ef012702719068864ed8e2d5f4a6b Signed-off-by: Gaurav Bhatt --- src/ClEventDeleterForm.cpp | 2 ++ src/ClEventEditorForm.cpp | 2 +- src/ClListPanel.cpp | 6 ++++++ src/ClReminderForm.cpp | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp index 7983202..29c88d5 100644 --- a/src/ClEventDeleterForm.cpp +++ b/src/ClEventDeleterForm.cpp @@ -382,6 +382,7 @@ EventDeleterForm::CreateGroupItem(int groupIndex, int itemWidth) if (__topBottomItemEnabled == true && (groupIndex == 0 || groupIndex == GetGroupCount() - 1)) { pItem->Construct(Dimension(itemWidth, H_GROUP_ITEM_MINIMUM)); + __pGroupedListViewDeleteList->SetItemEnabled(groupIndex, -1, false); return pItem; } @@ -419,6 +420,7 @@ EventDeleterForm::CreateGroupItem(int groupIndex, int itemWidth) pItem->SetTextColor(Color(COLOR_GROUP_ITEM_TEXT)); } + __pGroupedListViewDeleteList->SetItemEnabled(groupIndex, -1, true); return pItem; } diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp index f9c4114..499cc3d 100644 --- a/src/ClEventEditorForm.cpp +++ b/src/ClEventEditorForm.cpp @@ -602,7 +602,7 @@ void EventEditorForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView, int sectionIndex, int itemIndex, TableViewItem* pItem, TableViewItemStatus status) { - pItem->SetFocus(); + //pItem->SetFocus(); LinkedList* pList = null; switch (sectionIndex) { diff --git a/src/ClListPanel.cpp b/src/ClListPanel.cpp index f656693..6dde875 100644 --- a/src/ClListPanel.cpp +++ b/src/ClListPanel.cpp @@ -707,7 +707,13 @@ ListPanel::OnCurrentDateChanged(const DateTime& currentDate, const DateTime& pre result ListPanel::Update(void) { + int initialcount = __pGroupedListViewEventsList->GetGroupCount(); result r = __pGroupedListViewEventsList->UpdateList(); + int finalcount = __pGroupedListViewEventsList->GetGroupCount(); + if (initialcount != finalcount) + { + __pGroupedListViewEventsList->ExpandAllGroups(); + } if (r == E_SUCCESS) { diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp index b4901c8..b46f201 100644 --- a/src/ClReminderForm.cpp +++ b/src/ClReminderForm.cpp @@ -46,7 +46,7 @@ static const int W_REMINDER_TYPE_BUTTON_TIME_UNIT = 130; static const int H_REMINDER_TYPE_BUTTON_TIME_UNIT = 74; static const int X_TIME_UNIT_SELECTOR = 400; static const int Y_TIME_UNIT_SELECTOR = 1050; - +static const int W_RADIO_APPROX = 70; static const int MAX_REMINDER_TIME_UNIT = 99; ReminderForm::ReminderForm(void) @@ -274,7 +274,7 @@ ReminderForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth) pItem->SetIndividualSelectionEnabled(__pButtonReminderTimeUnit, __reminderType == REMINDER_TYPE_CUSTOM); x += __pButtonReminderTimeUnit->GetWidth(); - pText->Construct(Rectangle(x, 0, itemWidth - x, H_REMINDER_ITEM), ResourceManager::GetString(IDS_CLD_BODY_BEFORE_LC)); + pText->Construct(Rectangle(x, (H_REMINDER_ITEM - FONT_SIZE_REMINDER_TYPE_CUSTOM)/2, itemWidth - x - W_RADIO_APPROX, FONT_SIZE_REMINDER_TYPE_CUSTOM), ResourceManager::GetString(IDS_CLD_BODY_BEFORE_LC)); __pLabelBefore = pText; break; } -- 2.7.4