X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallActiveCallForm.cpp;h=11ef10b7672f1d69553aec35a384dce3f14ac14d;hb=41c8c6ea37bd4bb51cbec4c74ce0481e5e10b993;hp=b9884d35a9b0b23f293a824730f52036fc2b0e2f;hpb=4f167e0f998cf2cfc9d1e810b14738d86d1d6475;p=apps%2Fosp%2FCall.git

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index b9884d3..11ef10b 100644
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -224,8 +224,12 @@ ActiveCallForm::ShowDTMFKeypad(void)
 			pRelativeLayout->SetRelation(*__pDTMFKeypad, __pCallButtonsPanel, RECT_EDGE_RELATION_RIGHT_TO_LEFT);
 		}
 	}
-	EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
 	__pDTMFKeypad->SetShowState(true);
+	if(__DtmfString.IsEmpty() == false)
+	{
+		EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
+		pTextBox->SetText(__DtmfString);
+	}
 	__pDTMFKeypad->Draw(true);
 	__pDTMFKeypad->Show();
 }
@@ -270,11 +274,12 @@ ActiveCallForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui
 				//in Portrait mode it is hidden beneath DTMF Keypad.
 				SetShowStateOnKeypad(false);
 			}
-			String dtmfText = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText();
-			ShowDTMFKeypad();
-			//get new text box.
-			EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
-			pTextBox->SetText(dtmfText);
+			if(__pDTMFKeypad->GetShowState() == true)
+			{
+				String dtmfText = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText();
+				HideDTMFKeypad();
+				ShowDTMFKeypad();
+			}
 		}
 	}
 	//More option is displayed recreate it
@@ -290,9 +295,10 @@ ActiveCallForm::HideDTMFKeypad(void)
 {
 	if(__pDTMFKeypad != null)
 	{
-		__pDTMFKeypad->SetShowState(false);
-		__pDTMFKeypad->Draw(true);
-		__pDTMFKeypad->Show();
+		__DtmfString = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText();
+
+		RemoveControl(*__pDTMFKeypad);
+		__pDTMFKeypad = null;
 	}
 }
 
@@ -1063,6 +1069,7 @@ ActiveCallForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId&
 	{
 		__pMoreOptionsList->SetShowState(false);
 	}
+	__DtmfString.Clear();
 }
 
 void
@@ -1190,6 +1197,10 @@ ActiveCallForm::UpdateMultipleCallScreen(Tizen::Base::Collection::IListT<AppCall
 					pMoreBtn->SetShowState(false);
 				}
 				ShowPersonDetails(contactNo, IDC_NUMBER1_LABEL, IDC_CALLER1_LABEL, false,__pActiveCallInfo);
+				if(__pMoreOptionsListAnchor != null && __pMoreOptionsListAnchor->GetShowState() == true)
+				{
+					CreateMoreOptionsMenuList();
+				}
 			}
 			else
 			{
@@ -1826,7 +1837,7 @@ ActiveCallForm::CreateItem(int index, int itemWidth)
 	pTextElement->SetFont(font);
 	//construct Enriched text
 	EnrichedText* pEnrichedText = new (std::nothrow) EnrichedText();
-	Dimension textDimension;
+	FloatDimension textDimension;
 	font.GetTextExtent(confCallName, confCallName.GetLength(), textDimension);
 	textDimension.height = textDimension.height + font.GetDescender();
 	pEnrichedText->Construct(textDimension);
@@ -1834,8 +1845,8 @@ ActiveCallForm::CreateItem(int index, int itemWidth)
 	pEnrichedText->Add(*pTextElement);
 
 	//Add Enriched text to pItem
-	Point textPos(((2 * IDI_OPTIONMENU_ITEM_SPACING) + W_MGR_CONFCALL_BITMAP), ((IDI_OPTIONMENU_DIMEN.height - textDimension.height) / 2));
-	pItem->AddElement(Rectangle(textPos, textDimension), 2, *pEnrichedText);
+	FloatPoint textPos(((2 * IDI_OPTIONMENU_ITEM_SPACING) + W_MGR_CONFCALL_BITMAP), ((IDI_OPTIONMENU_DIMEN.height - textDimension.height) / 2));
+	pItem->AddElement(FloatRectangle(textPos, textDimension), 2, *pEnrichedText);
 	// Cleans up
 	pEnrichedText->RemoveAll(true);
 	delete pEnrichedText;