Nabi issue N_SE-56844 fix

Change-Id: I1602f2ba984b05ddba97ce3b1c424ae267a043f0
Signed-off-by: MANISH KUMAR <kr.manish@samsung.com>

diff --git a/src/StBaseForm.cpp b/src/StBaseForm.cpp
index 3812a36..6b242b6 100644 (file)
--- a/src/StBaseForm.cpp
+++ b/src/StBaseForm.cpp
@@ -317,7 +317,6 @@ BaseForm::GetHeightForStringArea(const Tizen::Base::String source, int width, in
                                font.GetTextExtent(temp, temp.GetLength(), dim);
                                if (dim.width >= boundwidth)
                                {
-                                       int length = temp.GetLength();
                                        temp.Clear();
                                        ++lineCount;
                                }

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index 5961320..0684c15 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -1004,6 +1004,65 @@ DateTimeForm::GetDefaultItemHeight(void)
 void
 DateTimeForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
 {
+       AppLogDebug("ENTER group[%d]", groupIndex);
+       Label* pLabel = static_cast<Label*>(pItem->GetControl(0));
+       if (pLabel == null)
+       {
+               AppLogDebug("pLabel is null");
+               return;
+       }
+       Rectangle itemRect = pItem->GetBounds();
+       int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+       int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+       LabelTextStyle style = LABEL_TEXT_STYLE_BOLD;
+       int fontSize = GetFontSize();
+       String groupText;
+
+       switch (groupIndex)
+       {
+       case ID_GROUP_DATE_AND_TIME_MAIN:
+               // fall through
+       case ID_GROUP_DATE_AND_TIME_FORMAT:
+               {
+                       yItemOffset = Y_GROUP_INDEX_DEFAULT;
+                       itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+               }
+               break;
+
+       case ID_GROUP_DATE_AND_TIME_LOCAL_TIME:
+               {
+                       style = LABEL_TEXT_STYLE_NORMAL;
+                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_USE_TIME_PROVIDED_BY_NETWORK");
+                       itemHeight = GetHeightForStringArea(groupText, itemRect.width - RELATIVE_LAYOUT_RIGHT_MARGIN, fontSize) + H_TEXT_GAP;
+               }
+               break;
+
+       case ID_GROUP_DATE_AND_TIME_FIRST_DAY:
+               {
+                       itemHeight = 0;
+               }
+               break;
+
+       case ID_GROUP_DATE_AND_TIME_FORMAT_LIST:
+               // fall through
+       case ID_GROUP_DATE_AND_TIME_FIRST_DAY_LIST:
+               {
+                       itemHeight = 0;
+               }
+               break;
+
+       default:
+               {
+                       yItemOffset = Y_GROUP_INDEX_DEFAULT;
+                       itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+               }
+               break;
+       }
+       itemRect.height = itemHeight;
+       pLabel->SetBounds(pLabel->GetX(), pLabel->GetY(), pLabel->GetWidth(), itemHeight);
+       pItem->SetBounds(itemRect);
+       AppLogDebug("EXIT");
 }
 
 void