Fix for N_SE-50753,N_SE-50678

Change-Id: Iecd08a39e13ef189d4d6dedcf15e8c4c93e7c9ca
Signed-off-by: Gaurav Bhatt <gaurav.bhatt@samsung.com>

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 97859ce..9e23bf5 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -1025,7 +1025,7 @@ EventEditorForm::OnActionPerformed(const Control& source, int actionId)
 void
 EventEditorForm::OnCalendarEventChanged(void)
 {
-       if(__pPm->IsEventValid() == false)
+       if(__style == EDIT_EVENT_FORM_STYLE_EDIT && __pPm->IsEventValid() == false)
        {
                Tizen::Base::Collection::IListT<SceneId> *ptr = SceneManager::GetInstance()->GetSceneHistoryN();
                SceneId original;

diff --git a/src/ClSettingForm.cpp b/src/ClSettingForm.cpp
index 2a1c0c6..20de25c 100644 (file)
--- a/src/ClSettingForm.cpp
+++ b/src/ClSettingForm.cpp
@@ -85,6 +85,7 @@ static const int H_MARGIN = 8;
 static const float H_ICON_SCALE = 0.514;
 static const int IDA_SETTING_FORM_PARSE_VCS_FILE_COMPLETE = 90001;
 static const int H_ITEM_MARGIN = 68;
+static const int W_APPROX = 7;
 
 
 class AsyncVcsParser
@@ -826,11 +827,11 @@ SettingForm::CreateFirstDayOfWeekSundayItemN(int itemWidth)
        titleText.RemoveAll(true);
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(Dimension(itemWidth, actualHeight + H_ITEM_MARGIN), TABLE_VIEW_ANNEX_STYLE_RADIO);
+       pItem->Construct(FloatDimension(itemWidth, actualHeight + H_ITEM_MARGIN), TABLE_VIEW_ANNEX_STYLE_RADIO);
        pItem->SetBackgroundColor(Color(COLOR_EXPANDED_ITEM_BACKGROUND), TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL);
 
        Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(Rectangle(0, 0, itemWidth - pItem->GetAnnexWidth(TABLE_VIEW_ANNEX_STYLE_RADIO), actualHeight+ H_ITEM_MARGIN),
+       pLabel->Construct(FloatRectangle(0, 0, itemWidth - pItem->GetAnnexWidthF(TABLE_VIEW_ANNEX_STYLE_RADIO) - W_APPROX, actualHeight+ H_ITEM_MARGIN),
                                          title);
        pLabel->SetTextConfig(__fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -862,7 +863,7 @@ SettingForm::CreateFirstDayOfWeekMondayItemN(int itemWidth)
        pItem->SetBackgroundColor(Color(COLOR_EXPANDED_ITEM_BACKGROUND), TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL);
 
        Label* pLabel = new (std::nothrow) Label();
-       pLabel->Construct(Rectangle(0, 0, itemWidth - pItem->GetAnnexWidth(TABLE_VIEW_ANNEX_STYLE_RADIO), actualHeight + H_ITEM_MARGIN),
+       pLabel->Construct(Rectangle(0, 0, itemWidth - pItem->GetAnnexWidth(TABLE_VIEW_ANNEX_STYLE_RADIO) - W_APPROX, actualHeight + H_ITEM_MARGIN),
                                                title);
        pLabel->SetTextConfig(__fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);