Fixed Nabi Issues 52332,54256,54601,54130,54264,54471

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

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index e4d15fd..6952b54 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -43,8 +43,8 @@ using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Media;
 
 const wchar_t* DEFAULT_VALUE_PARENTID = L"0";
-static const wchar_t* IDB_TAB_ICON_BOOKMARK = L"I01_tab_icon_bookmarks.png";
-static const wchar_t* IDB_TAB_ICON_HISTORY = L"I01_tab_icon_history.png";
+static const wchar_t* IDB_TAB_ICON_BOOKMARK = L"I01_search_list_icon_favorite.png";
+static const wchar_t* IDB_TAB_ICON_HISTORY = L"I01_search_list_icon_history.png";
 static const wchar_t* IDB_NO_CONTENT_BOOKMARK = L"I01_Nocontents_Bookmarks.png";
 static const wchar_t* IDB_ICON_FOLDER_OPEN = L"I01_icon_folder_open.png";
 
@@ -294,8 +294,8 @@ BookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
        case IDA_FOOTER_ITEM1:
        {
                __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
-               GetHeader()->SetItemSelected(0);
-               GetHeader()->Invalidate(true);
+//             GetHeader()->SetItemSelected(0);
+//             GetHeader()->Invalidate(true);
                SceneManager* pSceneManager = SceneManager::GetInstance();
                pBookMark = dynamic_cast< BookmarkData* >(__pData->GetAt(__selectedindex));
 
@@ -644,7 +644,7 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
 //             if(__pSearchBar->GetMode() == SEARCH_BAR_MODE_INPUT)
 //                     pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 //             else
-                       pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url - 44 + __fontSize, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+                       pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url - 44 + __fontSize, width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_LISTVIEW_TEXT,CUSTOM_COLOR_LISTVIEW_TEXT,true);
 
                if (pBitmap != null)
                {
@@ -1009,7 +1009,7 @@ void
 BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source, Tizen::Ui::Controls::SearchBarMode mode)
 {
        result r = E_FAILURE;
-       AppLog("ABCD::BookmarkListForm::OnSearchBarModeChanged");
+       AppLog("ABCD::BookmarkListForm::OnSearchBarModeChanged %d",GetClientAreaBounds().height);
 
        if (mode == SEARCH_BAR_MODE_NORMAL)
        {
@@ -1020,7 +1020,7 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
                __searchBookmark = false;
                r = __pListview->UpdateList();
 //             __pSearchListView->SetBounds(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height -__pSearchBar->GetHeight());
-               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
+               __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
                TryCatch( !IsFailed(r),,"BookmarkListForm::OnSearchBarModeChanged Update list failed %s",GetErrorMessage(r));
                CATCH:return;
        }
@@ -1032,10 +1032,10 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
 
                if(__pSearchBar)
                {
-                       r = __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
+                       AppLog("heightarea %d",GetClientAreaBounds().height - __pSearchBar->GetHeight());
+                       r = __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
                        __pSearchBar->SetText(L"");
                }
-               AppLog("OnSearchBarModeChanged SetContentAreaSize heihgt %d, %d",__pSearchListView->GetHeight() , GetClientAreaBounds().height - __pSearchBar->GetHeight());
                 __pListview->UpdateList();
                __pSearchListView->UpdateList();
        }
@@ -1045,7 +1045,7 @@ void
 BookmarkListForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
        AppLog("ABCD::BookmarkListForm::OnKeypadWillOpen");
-       GetFooter()->SetShowState(false);
+//     GetFooter()->SetShowState(false);
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchListView->SetEnabled(false);
        __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
@@ -1057,7 +1057,6 @@ BookmarkListForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
        AppLog("ABCD::BookmarkListForm::OnKeypadOpened");
        GetFooter()->SetShowState(false);
-       AppLog("ABCD::BookmarkListForm::OnKeypadOpened");
        __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
        __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
        Invalidate(true);
@@ -1118,9 +1117,10 @@ BookmarkListForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui:
 void
 BookmarkListForm::OnKeypadBoundsChanged(Tizen::Ui::Control& source)
 {
+       AppLog("ABCD::BookmarkListForm::OnKeypadBoundsChanged");
        FloatRectangle clientRect;
        clientRect = GetClientAreaBoundsF();
-       AppLogDebug("SearchBarForm::OnKeypadBoundsChanged ClientBounds(%f, %f, %f, %f)",clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+       AppLogDebug("ABCD::SearchBarForm::OnKeypadBoundsChanged ClientBounds(%f, %f, %f, %f)",clientRect.x, clientRect.y, clientRect.width, clientRect.height);
        __pSearchBar->SetContentAreaSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
        __pSearchListView->SetSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
        __pListview->SetSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
@@ -1167,8 +1167,14 @@ void
 BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        AppLog("BookmarkListForm::OnOrientationChanged start");
-       __pListview->SetBackgroundColor(GetBackgroundColor());
-       __pSearchListView->SetBackgroundColor(GetBackgroundColor());
+       if (__pListview)
+       {
+               __pListview->SetBackgroundColor(GetBackgroundColor());
+       }
+       if (__pSearchListView)
+       {
+               __pSearchListView->SetBackgroundColor(GetBackgroundColor());
+       }
        if (__pListview)
        {
                if(__pSearchBar->GetShowState())
@@ -1179,7 +1185,7 @@ BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen:
                {
                        __pListview->SetBounds(__pListview->GetX(),0,GetClientAreaBounds().width ,GetClientAreaBounds().height);
                }
-               __pListview->UpdateList();
+
        }
 
        if (__pSearchListView && __pListview)
@@ -1224,3 +1230,18 @@ BookmarkListForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneI
        return;
 }
 
+void
+BookmarkListForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)
+{
+       AppLog("receiving userevent for appcontrol %d",requestId);
+       if (requestId == APPCONTROL_LAUNCH_MAX_LIMIT_REACHED)
+       {
+               AppLog("receiving userevent for appcontrol %d ",requestId);
+               if(__pConfirmationPopup)
+               {
+                       __pConfirmationPopup->SetShowState(false);
+                       delete __pConfirmationPopup;
+                       __pConfirmationPopup = null;
+               }
+       }
+}