Fixed Nabi Issues

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

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 7221f39..4fc3f32 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -4232,6 +4232,11 @@ MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPositi
 void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
 {
        AppLog("abcde::MainForm::OnTouchLongPressed %d, %d" ,currentPosition.x,currentPosition.y);
+       if(TouchEventManager::GetInstance()->GetTouchInfoListN()->GetCount() >1)
+       {
+               AppLog("Returning because of more than one touch point.");
+               return;
+       }
        __longPressPoint = currentPosition;
 
        if (__pHitElementResult != null)
@@ -4416,7 +4421,8 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
 {
        AppLog("MainForm::OnOrientationChanged GetClientAreaBounds %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height);
        int widthContextItem = 0;
-
+       if(__pFindWordCountLabel)
+               __pFindWordCountLabel->SetBounds(__pFindWordCountLabel->GetX(),__pFindWordCountLabel->GetY(),124,__pFindWordCountLabel->GetHeight());
        // As per the platform engineer comment removed this line
        /*if(__pWebViewer != null)
        {
@@ -5387,15 +5393,29 @@ MainForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                bool exist = false;
                String url=L"";
                url=__pWindowInfo->pageUrl;
+               AppLog("MainForm::OnFormMenuRequested url %ls",url.GetPointer());
                result r = E_SUCCESS;
                Bitmap* pBitmap = null;
-
-               r=BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(url,exist);
-               if (IsFailed(r))
-               {
-                       AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED failed");
-                       return;
-               }
+               String lastChar = L"";
+               if(url.SubString(url.GetLength()-1,lastChar));
+//             if(lastChar == L"/")
+//             {
+//                     bool exist1 = false;
+//                     bool exist2 = false;
+//                     r=BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(url,exist1);
+//                     url.SubString(0,url.GetLength() - 1,url);
+//                     r=BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(url,exist2);
+//                     exist = exist1 | exist2;
+//             }
+//             else
+//             {
+                       r=BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(url,exist);
+                       if (IsFailed(r))
+                       {
+                               AppLogDebug("ONACTION_PERFORMED:IDA_MOREBTN_CLICKED failed");
+                               return;
+                       }
+//             }
                if ( exist == true)
                {
                        pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_ON_TEMP);