Fixed Nabi Issues

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

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 80522ec..7c36e82 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -1039,7 +1039,7 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
 void
 BookmarkListForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       GetFooter()->SetShowState(false);
+//     GetFooter()->SetShowState(false);
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), __pSearchListView->GetHeight() + GetFooter()->GetHeight());
        __pSearchListView->SetEnabled(false);
        __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index 526a45d..4374f15 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -193,28 +193,14 @@ InternetApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination)
 void
 InternetApp::OnForeground(void)
 {
-       AppLog("InternetApp::OnForeground called");
-       Frame* pCurrentFrame = null;
-       pCurrentFrame =  Application::GetInstance()->GetAppFrame()->GetFrame();
 
-       if (pCurrentFrame != null)
-       {
-               pCurrentFrame->SetEnabled(true);
-       }
+
 }
 
 void
 InternetApp::OnBackground(void)
 {
 
-       Frame* pCurrentFrame = null;
-       pCurrentFrame =  Application::GetInstance()->GetAppFrame()->GetFrame();
-
-       if (pCurrentFrame != null)
-       {
-               pCurrentFrame->SetEnabled(false);
-       }
-
 }
 
 void

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 7647607..9191969 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -824,15 +824,15 @@ MainForm::InitImageLinkContextMenu(Tizen::Graphics::Point p)
                __pImageMenu = null;
        }
 
-       p.y = p.y + __pAddressbar->GetHeight() + 12;
-       if (p.y < 100)
-       {
-               direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
-       }
-       else
-       {
-               direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
-       }
+       p.y = p.y + __pAddressbar->GetHeight();
+//     if (p.y < 100)
+//     {
+//             direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
+//     }
+//     else
+//     {
+//             direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
+//     }
        __pImageMenu = new (std::nothrow) ContextMenu();
        r = __pImageMenu->Construct(p, CONTEXT_MENU_STYLE_LIST, direction);
        TryCatch(!IsFailed(r),, "Context image menu creation failed with%s",GetErrorMessage(r));
@@ -850,7 +850,8 @@ MainForm::InitImageLinkContextMenu(Tizen::Graphics::Point p)
 
 }
 
-result MainForm::InitSelectTextContextMenu(Tizen::Graphics::Point p, bool pasteOption, bool onlyPasteOption = false)
+result
+MainForm::InitSelectTextContextMenu(Tizen::Graphics::Point p, bool pasteOption, bool onlyPasteOption = false)
 {
        result r = E_SUCCESS;
        ContextMenuAnchorDirection direction = CONTEXT_MENU_ANCHOR_DIRECTION_AUTO;
@@ -3660,6 +3661,11 @@ MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
                __pFooterPanel->SetShowState(false);
                __pWebViewer->SetBounds(Rectangle(0, 0,GetClientAreaBounds().width, GetClientAreaBounds().height));
        }
+       if(__pImageMenu && __pImageMenu->GetShowState() == true)
+       {
+               __pImageMenu->SetAnchorPosition(Point(__pImageMenu->GetAnchorPosition().x/2,__pImageMenu->GetAnchorPosition().y/2));
+               AppLog("omgomgomg");
+       }
        Invalidate(true);
 }
 

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index 0a6c333..0a32e42 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -183,18 +183,20 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
        {
        case 0:
        {
-               Popup::SetShowState(false);
-               Popup::Show();
+
                // share via message
                StartMessageAppControl();
+               Popup::SetShowState(false);
+               Popup::Show();
        }
        break;
        case 1:
        {
-               Popup::SetShowState(false);
-               Popup::Show();
+
                // share via email
                StartEmailAppControl();
+               Popup::SetShowState(false);
+               Popup::Show();
        }
        break;
        default:
@@ -356,6 +358,7 @@ SharePopup::StartEmailAppControl(void)
    {
           extraData.Add(&attachKey, pDataList);
    }
+
    AppControl* pAc = AppManager::FindAppControlN(L"tizen.email", L"http://tizen.org/appcontrol/operation/compose");
    if (pAc)
    {
@@ -446,6 +449,7 @@ SharePopup::StartMessageAppControl(void)
                // type is SMS , attach the text
                extraData.Add(&textKey, &textVal);
        }
+
        AppControl* pAc = AppManager::FindAppControlN(L"tizen.messages", L"http://tizen.org/appcontrol/operation/compose");
        if (pAc)
        {
@@ -466,10 +470,27 @@ SharePopup::StartMessageAppControl(void)
 void
 SharePopup::OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList)
 {
+       AppLog("InternetApp::OnForeground called");
+       Frame* pCurrentFrame = null;
+       pCurrentFrame =  Application::GetInstance()->GetAppFrame()->GetFrame();
 
+       if (pCurrentFrame != null)
+       {
+               pCurrentFrame->SetEnabled(true);
+               pCurrentFrame->Invalidate(true);
+       }
 }
 
 void SharePopup::OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
 {
+       AppLog("SharePopup::OnAppControlCompleteResponseReceived");
+       Frame* pCurrentFrame = null;
+       pCurrentFrame =  Application::GetInstance()->GetAppFrame()->GetFrame();
+
+       if (pCurrentFrame != null)
+       {
+               pCurrentFrame->SetEnabled(true);
+               pCurrentFrame->Invalidate(true);
+       }
 
 }