From a1e30f91bf92b7048ee7646238506071bfc0614a Mon Sep 17 00:00:00 2001 From: Gwangbok Kim Date: Mon, 28 Oct 2013 14:37:42 +0900 Subject: [PATCH] fix N_SE-56355, N_SE-56365 Change-Id: I689c447d0f1d08334e3e98074fb52af9f29dd73e Signed-off-by: Gwangbok Kim --- project/inc/CreateContactForm.h | 2 +- project/inc/EditContactForm.h | 2 +- project/src/CreateContactForm.cpp | 4 ++-- project/src/EditContactForm.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project/inc/CreateContactForm.h b/project/inc/CreateContactForm.h index 059605e..60a2516 100644 --- a/project/inc/CreateContactForm.h +++ b/project/inc/CreateContactForm.h @@ -75,7 +75,7 @@ private: Tizen::Ui::Controls::EditField* __pEmailEditField; Tizen::Ui::Controls::EditField* __pUrlEditField; Tizen::Ui::Controls::EditField* __pOrganizationEditField; - Tizen::Ui::Controls::ExpandableEditArea* __pNoteEditField; + Tizen::Ui::Controls::EditArea* __pNoteEditField; Tizen::Ui::Controls::EditDate* __pEventEditDate; Tizen::Ui::Controls::Label* __pAddressbookNameLabel; diff --git a/project/inc/EditContactForm.h b/project/inc/EditContactForm.h index 1cdebbe..e41d169 100644 --- a/project/inc/EditContactForm.h +++ b/project/inc/EditContactForm.h @@ -76,7 +76,7 @@ private: Tizen::Ui::Controls::EditField* __pEmailEditField; Tizen::Ui::Controls::EditField* __pUrlEditField; Tizen::Ui::Controls::EditField* __pOrganizationEditField; - Tizen::Ui::Controls::ExpandableEditArea* __pNoteEditField; + Tizen::Ui::Controls::EditArea* __pNoteEditField; Tizen::Ui::Controls::EditDate* __pEventEditDate; Tizen::Social::AddressbookManager* __pAddressbookMgr; diff --git a/project/src/CreateContactForm.cpp b/project/src/CreateContactForm.cpp index 12ee068..87d2b84 100644 --- a/project/src/CreateContactForm.cpp +++ b/project/src/CreateContactForm.cpp @@ -193,8 +193,8 @@ CreateContactForm::OnInitializing(void) pNoteLabel->SetBackgroundColor(color); pScrollPanel->AddControl(pNoteLabel); - __pNoteEditField = new (std::nothrow) ExpandableEditArea(); - __pNoteEditField->Construct(Rectangle(UI_X_POSITION_LEFT, yPosition += 60, GetClientAreaBounds().width - UI_X_RIGHT_MARGIN, UI_HEIGHT), EXPANDABLE_EDIT_AREA_STYLE_NORMAL, EXPANDABLE_EDIT_AREA_TITLE_STYLE_NONE, 5); + __pNoteEditField = new (std::nothrow) EditArea(); + __pNoteEditField->Construct(Rectangle(UI_X_POSITION_LEFT, yPosition += 60, GetClientAreaBounds().width - UI_X_RIGHT_MARGIN, UI_HEIGHT), INPUT_STYLE_FULLSCREEN, 2000); __pNoteEditField->SetGuideText(L"Note"); pScrollPanel->AddControl(__pNoteEditField); diff --git a/project/src/EditContactForm.cpp b/project/src/EditContactForm.cpp index 2220b77..23abb67 100644 --- a/project/src/EditContactForm.cpp +++ b/project/src/EditContactForm.cpp @@ -184,8 +184,8 @@ EditContactForm::OnInitializing(void) pNoteLabel->SetBackgroundColor(color); pScrollPanel->AddControl(pNoteLabel); - __pNoteEditField = new (std::nothrow) ExpandableEditArea(); - __pNoteEditField->Construct(Rectangle(UI_X_POSITION_LEFT, yPosition += 60, GetClientAreaBounds().width - UI_X_RIGHT_MARGIN, UI_HEIGHT), EXPANDABLE_EDIT_AREA_STYLE_NORMAL, EXPANDABLE_EDIT_AREA_TITLE_STYLE_NONE, 5); + __pNoteEditField = new (std::nothrow) EditArea(); + __pNoteEditField->Construct(Rectangle(UI_X_POSITION_LEFT, yPosition += 60, GetClientAreaBounds().width - UI_X_RIGHT_MARGIN, UI_HEIGHT), INPUT_STYLE_FULLSCREEN, 2000); __pNoteEditField->SetGuideText(L"Note"); pScrollPanel->AddControl(__pNoteEditField); -- 2.7.4