From 2c25c8139b8ec1be10115b58f419da334ffb94eb Mon Sep 17 00:00:00 2001 From: Vinay Sachdeva Date: Fri, 11 Oct 2013 03:31:39 +0530 Subject: [PATCH] Fixed Nabi Issues N_SE-54919,54952,55044 Change-Id: I53622a1d50d38c3d1f6c858e71a92b7e9826e1bb Signed-off-by: Vinay Sachdeva --- src/IntBookmarkListForm.cpp | 11 +++++++---- src/IntHistoryListForm.cpp | 11 +++++++---- src/IntMainForm.cpp | 4 ++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp index 6952b54..9fec390 100644 --- a/src/IntBookmarkListForm.cpp +++ b/src/IntBookmarkListForm.cpp @@ -1011,6 +1011,9 @@ BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source, result r = E_FAILURE; AppLog("ABCD::BookmarkListForm::OnSearchBarModeChanged %d",GetClientAreaBounds().height); + __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); + __pSearchListView->Invalidate(false); + if (mode == SEARCH_BAR_MODE_NORMAL) { __pSearchListView->SetShowState(false); @@ -1067,10 +1070,10 @@ BookmarkListForm::OnKeypadClosed(Tizen::Ui::Control& source) { AppLog("ABCD::BookmarkListForm::OnKeypadClosed"); AppLog("jahsjkdad %d",Clipboard::GetInstance()->IsPopupVisible()); - if(Clipboard::GetInstance()->IsPopupVisible() == true) - { - return; - } +// if(Clipboard::GetInstance()->IsPopupVisible() == true) +// { +// return; +// } GetFooter()->SetShowState(true); __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); __pSearchListView->Invalidate(false); diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp index 845babe..5d83254 100644 --- a/src/IntHistoryListForm.cpp +++ b/src/IntHistoryListForm.cpp @@ -1051,6 +1051,9 @@ void HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode) { result r = E_FAILURE; + __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); + __pSearchListView->Invalidate(false); + if (mode == SEARCH_BAR_MODE_NORMAL) { if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false) @@ -1306,10 +1309,10 @@ HistoryListForm::OnKeypadOpened(Control& source) void HistoryListForm::OnKeypadClosed(Control& source) { - if(Clipboard::GetInstance()->IsPopupVisible() == true) - { - return; - } +// if(Clipboard::GetInstance()->IsPopupVisible() == true) +// { +// return; +// } GetFooter()->SetShowState(true); __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); __pSearchListView->Invalidate(false); diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index c99477c..bf032c7 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -4049,6 +4049,10 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint if(GetLastResult() == E_INVALID_ARG || (__pHitElementResult->GetTagName().Equals(L"INPUT",false) == false && __pHitElementResult->GetTagName().Equals(L"TEXTAREA",false) == false)) { __pHitElementResult = __pWebViewer->GetElementByPointN(__longPressPoint); + if(__pHitElementResult == null) + { + __pHitElementResult = __pWebViewer->GetElementByPointN(endPoint); + } } AppLog("datafirst endpoint error %s",GetErrorMessage(GetLastResult())); } -- 2.7.4