Fixed Nabi Issues 47903,47887,47972

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

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 16be6d5..e4d15fd 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -206,7 +206,7 @@ BookmarkListForm::OnInitializing(void)
        if (__pPopUp != null)
        {
                __pPopUp->Initialize();
-               AddControl(__pPopUp);
+//             AddControl(__pPopUp);
        }
 
        __pSearchListView = new(std::nothrow) ListView();
@@ -352,7 +352,7 @@ BookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
                        else
                        {
 
-                               if(pSceneManager->GoBackward(BackwardSceneTransition())!= E_SUCCESS)
+                               if(pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT))!= E_SUCCESS)
                                {
                                        AppLogDebug("BookmarkListForm::OnActionPerformed GoBackward failed");
                                        return;
@@ -552,7 +552,7 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
        const int width_Icon = 72 ;
        const int x_Margin_Title = 104 ;
        const int y_Margin_Title = 10;
-       const int width_Title = GetClientAreaBounds().width - 108 - 52 - 30;
+       const int width_Title = GetClientAreaBounds().width - 108 - 52 - 40;
        const int x_Margin_Url = 104 ;
        const int y_Margin_Url = 70 ;
        const int width_Url = GetClientAreaBounds().width - 108 - 52 ;
@@ -581,7 +581,7 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
                        delete pBitmap;
                }
 
-               pItem->AddElement(Rectangle(x_Margin_Title, 26, width_Title, 60 + (__fontSize - 44) ), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(),__fontSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+               pItem->AddElement(Rectangle(x_Margin_Title, 26, width_Title, 72 + (__fontSize - 44) ), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(),__fontSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 
                if ( __pItemContextFolder != NULL)
                {
@@ -866,7 +866,13 @@ BookmarkListForm::OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListVie
        case IDA_CONTEXT_ITEM_SHARE:
        {
                AppLogDebug("OnListViewContextItemStateChanged Share");
-
+               if (__pPopUp != null)
+               {
+                       delete __pPopUp;
+                       __pPopUp = null;
+               }
+               __pPopUp = new(std::nothrow) SharePopup();
+               __pPopUp->Initialize();
                BookmarkData* pBookmark = dynamic_cast<BookmarkData*>(__pData->GetAt(index));
                if (pBookmark != null)
                {
@@ -878,11 +884,9 @@ BookmarkListForm::OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListVie
                        __pPopUp->AddShareInfo(pShareInfo);
                }
 
-               if (__pPopUp != null)
-               {
-                       __pPopUp->SetShowState(true);
-                       __pPopUp->Show();
-               }
+               __pPopUp->SetShowState(true);
+               __pPopUp->Show();
+
        }
        break;
        default:
@@ -1145,6 +1149,12 @@ BookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneI
                __previousSceneId = previousSceneId;
        }*/
 
+       if (pList)
+       {
+               delete pList;
+               pList = null;
+       }
+
        if (__pListview != null)
        {
                __pListview->UpdateList();