X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontrols%2FFWebCtrl_AuthConfirmPopup.cpp;h=eeaa139033a1b7a14715381dc7e82172b6aa7ce4;hb=42a27b62eb0eab690d8a7c3bd10bb18bb5cfde06;hp=de447c403944be243f433897df480fe481a6c19a;hpb=86daf9e9f4a4ec7fffd9b80556243f16ff1239ee;p=framework%2Fosp%2Fweb.git diff --git a/src/controls/FWebCtrl_AuthConfirmPopup.cpp b/src/controls/FWebCtrl_AuthConfirmPopup.cpp index de447c4..eeaa139 100755 --- a/src/controls/FWebCtrl_AuthConfirmPopup.cpp +++ b/src/controls/FWebCtrl_AuthConfirmPopup.cpp @@ -89,7 +89,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica Rectangle rect(0, 0, 0, 0); rect.width = pPopupData->popupDim.width; - rect.height = (2*pPopupData->spacePad) + (pPopupData->editDim.height*2) + pPopupData->btnDim.height + (2*pPopupData->labelDim.height); + rect.height = (2*pPopupData->spacePad) + (pPopupData->editDim.height*2) + pPopupData->panelHeight + (2*pPopupData->labelDim.height); r = _WebPopup::Construct(true, Dimension(rect.width, rect.height)); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -104,7 +104,6 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica String hostRealm(host); hostRealm.Append(L": \n "); hostRealm.Append(realm); - hostRealm.Append(L"\""); r = pLabel->Construct(rect, hostRealm); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -177,7 +176,6 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica pLayout->SetHorizontalAlignment(*pHostLabel, LAYOUT_HORIZONTAL_ALIGN_CENTER); pLayout->SetHorizontalAlignment(*__pIdEditField, LAYOUT_HORIZONTAL_ALIGN_CENTER); pLayout->SetHorizontalAlignment(*__pPwdEditField, LAYOUT_HORIZONTAL_ALIGN_CENTER); - pLayout->SetHorizontalAlignment(*pButtonPanel, LAYOUT_HORIZONTAL_ALIGN_CENTER); pLayout->SetSpacing(*__pPwdEditField, pPopupData->spacePad); pLayout->SetSpacing(*pButtonPanel, pPopupData->spacePad); @@ -193,6 +191,9 @@ _AuthConfirmPopup::OnActionPerformed(const Control& source, int actionId) { result r = E_SUCCESS; + r = HidePopup(); + SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + switch (actionId) { case ID_BUTTON_AUTH_PROCESS: @@ -206,9 +207,6 @@ _AuthConfirmPopup::OnActionPerformed(const Control& source, int actionId) default: break; } - - r = HidePopup(); - SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); } bool