From d09964af1ee78c11b25a6a5a20d8f1da9f1e7c1b Mon Sep 17 00:00:00 2001
From: rahul dutt <rahul.dutt@samsung.com>
Date: Wed, 4 Sep 2013 22:08:26 +0530
Subject: [PATCH] Fixed Nabi issues N_SE-50613, N_SE-49431, N_SE-50779,
 N_SE-50601, N_SE-50559

Change-Id: I99a63d1e3232ddae2d2cac136c48d78e8bc04501
---
 src/IntEditBookmarkListForm.cpp | 15 +++------------
 src/IntHistoryListForm.cpp      | 15 ++++++++++++---
 src/IntMainForm.cpp             | 14 +++++++++++---
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index be5b8f4..b8c6ec9 100644
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -858,14 +858,8 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
 		}
 	}
 
-	if(previousSceneId == IDSCN_ADD_BOOKMARK)
-		return;
-
-	/*labelString.Append(CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED"));
-	labelString.Append(L"\x200E"); // LEFT-TO-RIGHT MARK
-	labelString.Append(L"(");
-	labelString.Append(__selectedItemCount);
-	labelString.Append(L")");*/
+	//if(previousSceneId == IDSCN_ADD_BOOKMARK)
+	//	return;
 
 	if(__selectedItemCount >1)
 	{
@@ -897,11 +891,8 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
 	{
 		__pCheckButton->SetSelected(true);
 	}
-	__pInfoPanel->Draw();
-	__pInfoPanel->Show();
-
+	
 	Invalidate(true);
-
 }
 
 void
diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 3e2dc93..8cdb954 100644
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -463,7 +463,7 @@ HistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
 		if (pGroupItemClass->GetTitleText() != CommonUtil::GetString(L"IDS_BR_BODY_OLDER"))
 		{
 			text.Append(pGroupItemClass->GetStartTime().GetDay());
-			text.Append(L". ");
+			text.Append(L" ");
 			strMonth = pGroupItemClass->GetStartTime().GetMonth();
 			month = GetMonth(strMonth);
 			text.Append(month);
@@ -480,7 +480,7 @@ HistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
 		{
 			text.Append(L" - ");
 			text.Append(pGroupItemClass->GetEndTime().GetDay());
-			text.Append(L". ");
+			text.Append(L" ");
 			strMonth = pGroupItemClass->GetEndTime().GetMonth();
 			month = GetMonth(strMonth);
 			text.Append(month);
@@ -1243,7 +1243,6 @@ HistoryListForm::OnOrientationChanged(const Control& source, OrientationStatus o
 		{
 			return;
 		}
-		__pGroupedListView->UpdateList();
 
 		if (__pSearchListView != null)
 		{
@@ -1259,6 +1258,16 @@ HistoryListForm::OnOrientationChanged(const Control& source, OrientationStatus o
 				__pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
 		}
 
+		if(__pGroupData != NULL)
+		{
+			for (int groupIndex = 0; groupIndex < __pGroupData->GetCount(); groupIndex++)
+			{
+				for (int itemIndex = 0; itemIndex < __pGroupedListView->GetItemCountAt(groupIndex); itemIndex++)
+				{
+					__pGroupedListView->RefreshList(groupIndex, itemIndex,LIST_REFRESH_TYPE_ITEM_MODIFY);
+				}
+			}
+		}
 	}
 
 	if (__isNoHistoryPresent == true)
diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 5cc4010..072e148 100644
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -985,6 +985,10 @@ MainForm::InitSelectTextContextMenuF(FloatPoint p, bool pasteOption, bool onlyPa
 		p.y = p.y + 50;
 		direction = CONTEXT_MENU_ANCHOR_DIRECTION_DOWNWARD;
 	}
+	else if(__pWebViewer != null && (p.y > (__pWebViewer->GetHeight() + __pWebViewer->GetY())))
+	{
+		p.y = __pWebViewer->GetHeight() + __pWebViewer->GetY();
+	}
 	else
 	{
 		if(GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE )
@@ -2571,7 +2575,8 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 //		LoadUrl(url);
 		if (__pWebViewer != null && __pAddressbar != null)
 		{
-			__pWebViewer->Reload();
+			LoadUrl(url);
+			//__pWebViewer->Reload();
 			SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
 		}
 
@@ -2949,11 +2954,14 @@ MainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
 		pCanvas->DrawBitmap(Point(0,0),*pBitmap);
 		delete pBitmap;
 	}
-	if(__pWebViewer != null && __pWindowInfo != null)
+	if(__pWebViewer != null && __pWindowInfo != null && __pWindowInfo->pWebCanvasBitmap != null)
 		pCanvas->DrawBitmap(__pWebViewer->GetPosition(),*__pWindowInfo->pWebCanvasBitmap);
 
 	WindowInfo::pFormCanvasBitmap = new(std::nothrow) Bitmap();
-	WindowInfo::pFormCanvasBitmap->Construct(*pCanvas,Rectangle(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height - __pFooterPanel->GetHeight()));
+	if (__pFooterPanel)
+	{
+		WindowInfo::pFormCanvasBitmap->Construct(*pCanvas,Rectangle(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height - __pFooterPanel->GetHeight()));
+	}
 	delete pCanvas;
 	delete pWebCanvas;
 	if(__pAddressbar)
-- 
2.7.4