Fixed recursive appcontrol issue. Fixed Call reject from event injector during answer...

[apps/osp/Call.git] / src / CallActiveCallForm.cpp

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index df2a4f3..0f06c69 100644 (file)
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -330,6 +330,8 @@ ActiveCallForm::InitializeCallButtonsPanel(void)
        {
                pRelativeLayout->SetRelation(*__pCallButtonsPanel, *pKeysBgLbl, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                pRelativeLayout->SetRelation(*__pCallButtonsPanel, *pKeysBgLbl, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               pRelativeLayout->SetRelation(*__pCallButtonsPanel, *pKeysBgLbl, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM);
+               pRelativeLayout->SetRelation(*__pCallButtonsPanel, *pKeysBgLbl, RECT_EDGE_RELATION_TOP_TO_TOP);
        }
 
        return r;
@@ -590,15 +592,7 @@ ActiveCallForm::OnActionPerformed(const Control& source, int actionId)
                //switch to Dialer Form to make an call
                if(__pCallPresentor->GetCurrentCallCount() == 1)
                {
-/*             ArrayList* pArgs = new (std::nothrow) ArrayList(SingleObjectDeleter);
-               pArgs->Construct();
-               String* formType = new (std::nothrow) String();
-               formType->Append(__formType);
-               pArgs->Add(formType);
-               pSceneManager->GoForward( ForwardSceneTransition(IDSCN_DIALER, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
-                               SCENE_HISTORY_OPTION_NO_HISTORY), pArgs);*/
-                       __pCallPresentor->LaunchDialAppControl();
-
+               __pCallPresentor->LaunchDialAppControl();
                }
        }
        break;