Fixed Nabi Issues

[apps/osp/Internet.git] / src / IntAddressbar.cpp

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index e8efe0e..1c39882 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -56,7 +56,6 @@ Addressbar::Addressbar(void)
        __progressPercentage = 0;
        __pAddressbarBg = null;
        __pBgPanel = null;
-       __pClearBtn = null;
        __pFavIcon = FaviconManager::GetInstance()->GetDefaultFaviconN();
        __pFaviconLabel = null;
        __pLabelPrivateOn = null;
@@ -89,6 +88,7 @@ result
 Addressbar::OnTerminating(void)
 {
        DeviceManager::RemoveDeviceEventListener(DEVICE_TYPE_USB_CLIENT, *this);
+       return E_SUCCESS;
 }
 
 result
@@ -139,6 +139,7 @@ Addressbar::Initialize(const Rectangle& rect)
        __pClearBtn->SetActionId(IDA_CLEAR_URL);
        __pClearBtn->AddActionEventListener(*this);
        __pClearBtn->SetShowState(true);
+       __pClearBtn->SetFocusable(true);
 
        //Add the editfield for url
        __pAddressbarUrlField =  static_cast<EditField*> (GetControl(L"IDC_URL_EDITFIELD",true));
@@ -186,6 +187,7 @@ Addressbar::Initialize(const Rectangle& rect)
        __pAddressBackBtn->SetActionId(IDA_CANCEL);
        __pAddressBackBtn->AddActionEventListener(*this);
        __pAddressBackBtn->SetShowState(true);
+       __pAddressBackBtn->SetFocusable(true);
        //IDC_ADDRESS_BACK_BUTTON
 
        // Added to get the favorite url if not set then address bar is about blank
@@ -196,7 +198,7 @@ Addressbar::Initialize(const Rectangle& rect)
        }
        else if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
        {
-               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE"));
        }
        else
        {
@@ -300,7 +302,7 @@ Addressbar::ResetGuideText(void)
        }
        else if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_BLANK_PAGE")) == 0)
        {
-               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK"));
+               __pAddressbarUrlField->SetGuideText(CommonUtil::GetString(L"IDS_BR_BODY_BLANK_PAGE"));
        }
        else
        {
@@ -551,11 +553,12 @@ Addressbar::OnKeypadWillOpen(Tizen::Ui::Control& source)
 void
 Addressbar::OnKeypadBoundsChanged(Tizen::Ui::Control &source)
 {
-       AppLog("Coming here");
+       AppLog("XYZ::KeypadBoundsChanged");
+
        if(__pListener != null)
-               {
-                       __pListener->OnAddressBarKeypadBoundsChanged(*this);
-               }
+       {
+               __pListener->OnAddressBarKeypadBoundsChanged(*this);
+       }
 }
 
 void
@@ -653,12 +656,15 @@ Addressbar::OnFocusGained(const Control& source)
        {
                __pListener->OnAddressBarFocusGained(*this);
        }
+       __isAppBackGround = false;
 }
 
 void
 Addressbar::OnFocusLost(const Tizen::Ui::Control& source)
 {
        AppLog("XYZ::Addressbar::OnFocusLost");
+       if(GetShowState() == true)
+               __isAppBackGround = true;
 
 //     __editTextUrl = L"";
        if(__pListener != null)
@@ -695,7 +701,9 @@ Addressbar::OnDeviceStateChanged(DeviceType deviceType, const String &state)
 void
 Addressbar::SetAddressbarURLFocus()
 {
-       __pAddressbarUrlField->SetFocus();
+       AppLog("Addressbar::SetAddressbarURLFocus");
+       result r = __pAddressbarUrlField->SetFocus();
+       AppLog("Addressbar::SetAddressbarURLFocus result %s",GetErrorMessage(r));
 }
 
 String