X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallIncomingCallForm.cpp;h=fa067b7309c4f45c3adc867396ce12380ac00c06;hb=5c6c572623ac3701dd9c4eaed1be657bc70a21b1;hp=887aecab170a0f8123db8dd253ff126e89188512;hpb=309ccc13eb3fd773e597473136e3f15aa792de7e;p=apps%2Fosp%2FCall.git diff --git a/src/CallIncomingCallForm.cpp b/src/CallIncomingCallForm.cpp index 887aeca..fa067b7 100644 --- a/src/CallIncomingCallForm.cpp +++ b/src/CallIncomingCallForm.cpp @@ -218,17 +218,6 @@ IncomingCallForm::OnInitializing(void) } HideRejectPanel(); - Button* pButtonRejectMessage = static_cast(GetControl(IDC_REJECT_MESSAGE_BUTTON)); - if (pButtonRejectMessage) - { - SetBitmapToRejectMessageButton(IDS_REJECT_MESSAGE_BTN,IDB_REJECT_MESSAGE_BG, - IDB_REJECT_MESSAGE_UP_ARROW, IDB_REJECT_MESSAGE_ICON, false, false); - SetBitmapToRejectMessageButton(IDS_REJECT_MESSAGE_BTN,IDB_REJECT_MESSAGE_BG, - IDB_REJECT_MESSAGE_UP_ARROW, IDB_REJECT_MESSAGE_ICON, false, true); - pButtonRejectMessage->SetActionId(IDA_SHOW_REJECT_CALL_MESSAGE_PANEL); - pButtonRejectMessage->AddActionEventListener(*this); - } - //Get Reject list from Settings Manager IMapT* pMsgMap = SettingsManager::GetInstance()->GetRejectMessageListN(); if(pMsgMap != null) @@ -826,7 +815,16 @@ IncomingCallForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneI } CallApp* pCallApp = static_cast(CallApp::GetInstance()); pCallApp->SetTopMostWindow(true); - + Button* pButtonRejectMessage = static_cast(GetControl(IDC_REJECT_MESSAGE_BUTTON)); + if (pButtonRejectMessage) + { + SetBitmapToRejectMessageButton(IDS_REJECT_MESSAGE_BTN,IDB_REJECT_MESSAGE_BG, + IDB_REJECT_MESSAGE_UP_ARROW, IDB_REJECT_MESSAGE_ICON, false, false); + SetBitmapToRejectMessageButton(IDS_REJECT_MESSAGE_BTN,IDB_REJECT_MESSAGE_BG, + IDB_REJECT_MESSAGE_UP_ARROW, IDB_REJECT_MESSAGE_ICON, false, true); + pButtonRejectMessage->SetActionId(IDA_SHOW_REJECT_CALL_MESSAGE_PANEL); + pButtonRejectMessage->AddActionEventListener(*this); + } } @@ -1324,12 +1322,12 @@ IncomingCallForm::OnTouchReleased(const Control& source, const Point& currentPos if(__pRejectFinalVisElem == null) { __pRejectFinalVisElem = new (std::nothrow) VisualElement(); + __pRejectFinalVisElem->Construct(); + __pRejectFinalVisElem->SetName(IDI_REJECT_FINAL_VISUAL_ELE_NAME); } - __pRejectFinalVisElem->Construct(); __pRejectFinalVisElem->SetBounds(FloatRectangle(0, 0, W_DIAL_LABEL, H_DIAL_LABEL)); __pRejectFinalVisElem->SetShowState(true); __pRejectFinalVisElem->SetOpacity(1.00f); - __pRejectFinalVisElem->SetName(IDI_REJECT_FINAL_VISUAL_ELE_NAME); if(__pRejectLabel->GetVisualElement()->GetChild(IDI_REJECT_FINAL_VISUAL_ELE_NAME,true) == null) { AppLogDebug("AttachChild __pRejectFinalVisElem"); @@ -1399,12 +1397,13 @@ IncomingCallForm::OnTouchReleased(const Control& source, const Point& currentPos if(__pAcceptFinalVisElem == null) { __pAcceptFinalVisElem = new (std::nothrow) VisualElement(); + __pAcceptFinalVisElem->Construct(); + __pAcceptFinalVisElem->SetName(IDI_ACCEPT_FINAL_VISUAL_ELE_NAME); } - __pAcceptFinalVisElem->Construct(); __pAcceptFinalVisElem->SetBounds(FloatRectangle(0, 0, W_DIAL_LABEL, H_DIAL_LABEL)); - __pAcceptFinalVisElem->SetShowState(true); __pAcceptFinalVisElem->SetOpacity(1.0f); - __pAcceptFinalVisElem->SetName(IDI_ACCEPT_FINAL_VISUAL_ELE_NAME); + + if(__pAcceptLabel->GetVisualElement()->GetChild(IDI_ACCEPT_FINAL_VISUAL_ELE_NAME,true) == null) { AppLogDebug("AttachChild __pAcceptFinalVisElem");