From: Vinay Sachdeva Date: Fri, 26 Apr 2013 14:00:04 +0000 (+0530) Subject: Fixed Nabi Issues X-Git-Tag: 2.1b_release^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=dc28aa844014ae7566796a9f61de9373581fb35f;p=apps%2Fosp%2FInternet.git Fixed Nabi Issues Change-Id: I9c943dc562d9a4dd418ed86b774f124f64f4546a Signed-off-by: Vinay Sachdeva --- diff --git a/res/screen-size-normal/IDL_SHARE_POPUP.xml b/res/screen-size-normal/IDL_SHARE_POPUP.xml index 84252fe..bc68a37 100644 --- a/res/screen-size-normal/IDL_SHARE_POPUP.xml +++ b/res/screen-size-normal/IDL_SHARE_POPUP.xml @@ -3,20 +3,20 @@ This XML file was automatically generated by UiBuilder - do not modify by hand. --> - - + + - - + - + diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp index 9f4bb18..318fd95 100644 --- a/src/IntAddressbar.cpp +++ b/src/IntAddressbar.cpp @@ -653,9 +653,6 @@ Addressbar::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) case IDA_CANCEL: { - - __pAddressbarUrlField->SetText(__displayUrl); - __editTextUrl = L""; __pAddressbarUrlField->HideKeypad(); __pListener->OnAddressCancelledClicked(*this); //SetAddressbarMode(ADDRESSBAR_MODE_LOADING_COMPLETE); @@ -715,12 +712,14 @@ Addressbar::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::Keypa void Addressbar::OnKeypadClosed(Tizen::Ui::Control& source) { - if(__isClipboardOpen == true) + if (__isClipboardOpen == true) { __isClipboardOpen = false; __pListener->OnClipboardClosed(*this); return; } + __pAddressbarUrlField->SetText(__displayUrl); + __editTextUrl = L""; SetShowState(false); if(__pListener != null) { diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp index 5b7b24f..6122fbf 100644 --- a/src/IntHistoryListForm.cpp +++ b/src/IntHistoryListForm.cpp @@ -281,10 +281,6 @@ HistoryListForm::OnActionPerformed(const Control& source, int actionId) } } - - - - // r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT)); if (IsFailed(r)) { @@ -971,7 +967,11 @@ HistoryListForm::OnSearchBarModeChanged(SearchBar& source, SearchBarMode mode) result r = E_FAILURE; if (mode == SEARCH_BAR_MODE_NORMAL) { - // __pSearchBar->SetMode(SEARCH_BAR_MODE_INPUT); + if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false) + { + __pSearchListView->SetEnabled(true); + } + r = __pSearchListView->SetShowState(false); if (IsFailed(r)) { @@ -1191,12 +1191,7 @@ HistoryListForm::OnKeypadOpened(Control& source) void HistoryListForm::OnKeypadClosed(Control& source) { - if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false) - { - // __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL); - __pSearchListView->SetEnabled(true); - - } + GetFooter()->SetShowState(true); __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); __pSearchListView->Invalidate(false);