Fixed Nabi Issues

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

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index c76c120..d0085e0 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -3948,9 +3948,10 @@ MainForm::OnWebDataReceived(const Tizen::Base::String& mime,
 void
 MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint& endPoint)
 {
-       if(__isLongPressedDone == false)
-               return;
        AppLog("MainForm::OnWebPageBlockSelected");
+//     if(__isLongPressedDone == false)
+//             return;
+
        if (__pHitElementResult != null)
        {
                delete __pHitElementResult;
@@ -4109,15 +4110,16 @@ MainForm::RelayoutControls(bool showAddressbar,bool relayoutFooter)
                __webControlHeight -= __pFooterPanel->GetHeight();
 
                __pFooterPanel->SetBounds(0, __webControlPosition.y + __webControlHeight, GetClientAreaBounds().width, __pFooterPanel->GetHeight());
+               __webControlHeight = __webControlHeight + 12;
        }
        if (__pWebViewer != null && __pWebViewer->GetShowState() == true)
        {
-               if(__pWebViewer->GetX() == 0 && __pWebViewer->GetY() == __webControlPosition.y &&__pWebViewer->GetWidth() == GetClientAreaBounds().width &&__pWebViewer->GetHeight() == __webControlHeight + 12 )
+               if(__pWebViewer->GetX() == 0 && __pWebViewer->GetY() == __webControlPosition.y &&__pWebViewer->GetWidth() == GetClientAreaBounds().width &&__pWebViewer->GetHeight() == __webControlHeight )
                {
                }
                else
                {
-                       __pWebViewer->SetBounds(0, __webControlPosition.y, GetClientAreaBounds().width, __webControlHeight + 12);
+                       __pWebViewer->SetBounds(0, __webControlPosition.y, GetClientAreaBounds().width, __webControlHeight );
                        AppLog("xyz:: MainForm::RelayoutControls called __webControlHeight %d",__webControlHeight);
                        __pWebViewer->Invalidate(false);
                }
@@ -4298,7 +4300,7 @@ void MainForm::OnTextFound(int totalCount, int currentOrdinal)
                return;
        }
 
-       if (totalCount == 1)
+       if (totalCount == 1 || totalCount == currentOrdinal)
        {
                __pFindWordNext->SetEnabled(false);
        }