Fixed Nabi Issues

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

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 69b30e3..5b6d44e 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -854,6 +854,8 @@ result MainForm::InitSelectTextContextMenu(Tizen::Graphics::Point p, bool pasteO
 {
        result r = E_SUCCESS;
        ContextMenuAnchorDirection direction = CONTEXT_MENU_ANCHOR_DIRECTION_AUTO;
+       if(onlyPasteOption == true)
+               return E_SUCCESS;
 
        AppLog("MainForm::InitSelectTextContextMenu clicked on text");
        if (__pImageMenu != null)
@@ -1969,6 +1971,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __currentSearchStr.Clear();
                __currentSearchStr.Append(__currentSelectedStr);
                InitFindWordPanel();
+               __pFindWordEditField->SetText(__currentSearchStr);
                if(__pMenu != null)
                {
                        __pMenu->SetShowState(false);
@@ -2493,6 +2496,8 @@ MainForm::OnKeypadOpened(Tizen::Ui::Control& source)
 void
 MainForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
+
+
        if (__pAddressbar != null)
        {
                OnAddressBarKeypadClosed(*__pAddressbar);
@@ -3583,6 +3588,22 @@ void
 MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
 {
 
+       if(__pFindWordControl && __pFindWordControl->GetShowState() == true)
+       {
+               __currentSearchStr = L"";
+               __currentWordIndex = 0;
+               __maxOccurrances = 0;
+               __pFindWordEditField->SetText(L"");
+               __pFindWordNext->SetEnabled(false);
+               __pFindWordPrev->SetEnabled(false);
+               __pFindWordCountLabel->SetText(L"0/0");
+               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pFindWordControl->SetShowState(false);
+               if (__pFindWordEditField)
+                       __pFindWordEditField->HideKeypad();
+       }
+
+
        if (__pWebViewer != null && __pFooterPanel != null)
        {
                AppLog("MainForm::OnOrientationChanged GetClientAreaBounds().height %d ", GetClientAreaBounds().height);