Fixed Nabi Issues

Change-Id: Iff64d060273725770926f64f6c32055a942b93f9
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index bee3d06..ba8a22c 100644 (file)
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -298,6 +298,7 @@ private:
        bool __isLoadingData;
        bool __isLoadingCompleted;
        bool __isLongPressedDone;
+       bool __isWebKeypadOpened;
        int __progressPercentage;
 
        AddressBarMode __currentAddMode;

diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index e031916..d2836da 100644 (file)
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -797,6 +797,17 @@ Addressbar::OnFocusGained(const Control& source)
        //SetAddressbarMode(ADDRESSBAR_MODE_EDIT);
        //      SetAddressbarMode(__prevAddMode);
        __pAddressbarUrlField->SetCursorPosition(__pAddressbarUrlField->GetTextLength());
+       if(__pAddressbarUrlField != null)
+       {
+               if(__pAddressbarUrlField->GetTextLength() == 0)
+               {
+                       __pAddressbarUrlField->SetKeypadActionEnabled(false);
+               }
+               else
+               {
+                       __pAddressbarUrlField->SetKeypadActionEnabled(true);
+               }
+       }
        if (__pListener != null)
        {
                __pListener->OnAddressBarKeypadWillOpen(*this);

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 71efd52..09a05bc 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -188,6 +188,7 @@ MainForm::MainForm(void)
        __pFooterLabel = null;
        __pStopBtn = null;
        __pClearBtn = null;
+       __isWebKeypadOpened = false;
 }
 
 MainForm::~MainForm(void)
@@ -2439,7 +2440,8 @@ MainForm::OnUrlSubmitted(Addressbar& addBar)
        String url = addBar.GetUrl();
        AppLog("MainForm::OnUrlSubmitted url is %ls", url.GetPointer());
 
-       __pFooterPanel->SetShowState(true);
+//     __pFooterPanel->SetShowState(true);
+       OnAddressCancelledClicked(*__pAddressbar);
 //     __pAddressbar->SetShowState(false);
 //     RelayoutControls(false);
        LoadUrl(url);
@@ -3146,6 +3148,11 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
                __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),124,__pFindWordCountLabel->GetHeight());
                __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),174,__pFindWordEditField->GetHeight());
        }
+       else
+       {
+               __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),124,__pFindWordCountLabel->GetHeight());
+               __pFindWordEditField->SetBounds(__pFindWordEditField->GetX(),__pFindWordEditField->GetY(),174,__pFindWordEditField->GetHeight());
+       }
 
        __maxOccurrances = totalCount;
        __currentWordIndex = currentOrdinal;
@@ -3243,6 +3250,7 @@ void
 MainForm::OnWebKeypadWillOpen(Tizen::Web::Controls::Web& source)
 {
        AppLog("MainForm::OnWebKeypadWillOpen");
+       __isWebKeypadOpened = true;
        //      OnAddressBarKeypadOpened(*__pAddressbar);
 }
 
@@ -3272,6 +3280,7 @@ MainForm::OnWebKeypadClosed(Tizen::Web::Controls::Web& source)
 {
        __pFooterPanel->SetShowState(true);
        OnAddressBarKeypadClosed(*__pAddressbar);
+       __isWebKeypadOpened = false;
 }
 
 void
@@ -3383,7 +3392,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
                __currentSelectedStr.Clear();
                __currentSelectedStr = __pWebViewer->GetTextFromBlock();
 
-               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) &&  value.GetLength() == 0 && innerHtml.GetLength() == 0)
+               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) &&  value.GetLength() == 0 && innerHtml.GetLength() == 0 && __isWebKeypadOpened == true)
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -3775,6 +3784,7 @@ MainForm::OnTextValueChanged (const Tizen::Ui::Control &source)
        {
                __currentSearchStr = L"aaaaaaaabbbbbbbccccccc";
                StartWordSearch();
+               __currentSearchStr = L"";
                AppLogDebug("Enter something");
        }
 }