From 7543b1fb0d64d01e20f1f7cb04d00b1fc0af187c Mon Sep 17 00:00:00 2001 From: Vinay Sachdeva Date: Fri, 3 May 2013 04:17:51 +0530 Subject: [PATCH] Fixed Nabi Issues N_SE-37149,37150,37266,36875,37109,36975,36962,36964,37114,37110,37111 Change-Id: I1bd17dde9a2f7ff4a16eaecb0af31a209f35e053 Signed-off-by: Vinay Sachdeva --- res/screen-size-normal/IDL_FORM.xml | 12 ++++++------ src/IntAddBookmarkForm.cpp | 1 + src/IntAddressbar.cpp | 9 --------- src/IntBookmarkListForm.cpp | 3 ++- src/IntInternetApp.cpp | 8 ++++++++ src/IntMainForm.cpp | 2 +- src/IntSharePopup.cpp | 11 ----------- 7 files changed, 18 insertions(+), 28 deletions(-) diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml index 07e7364..6c2b0e5 100644 --- a/res/screen-size-normal/IDL_FORM.xml +++ b/res/screen-size-normal/IDL_FORM.xml @@ -14,12 +14,12 @@ - + - + @@ -79,6 +79,6 @@ - + diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp index 13944d8..68d12b6 100644 --- a/src/IntAddBookmarkForm.cpp +++ b/src/IntAddBookmarkForm.cpp @@ -1122,6 +1122,7 @@ AddBookmarkForm::OnOrientationChanged(const Control& source, OrientationStatus o // __pEditFieldUrl->HideKeypad(); // } + AppLog("AddBookmarkForm::OnOrientationChanged ClientAreaBound %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height); if (orientationStatus == ORIENTATION_STATUS_LANDSCAPE) { if (__pScrollPanel != null) diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp index 860fc67..9bdfd44 100644 --- a/src/IntAddressbar.cpp +++ b/src/IntAddressbar.cpp @@ -731,15 +731,6 @@ Addressbar::OnKeypadClosed(Tizen::Ui::Control& source) __pListener->OnClipboardClosed(*this); return; } - if(__pAddressbarUrlField) - __pAddressbarUrlField->SetText(__displayUrl); - __editTextUrl = L""; - SetShowState(false); - if(__pListener != null) - { - __pListener->OnAddressBarKeypadClosed(*this); - } - } diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp index bb4b31b..80522ec 100644 --- a/src/IntBookmarkListForm.cpp +++ b/src/IntBookmarkListForm.cpp @@ -240,6 +240,7 @@ BookmarkListForm::OnInitializing(void) r = __pSearchListView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height -72 - 30), true, false); TryCatch( !IsFailed(r),,"BookmarkListForm::OnSearchBarModeChanged Update list failed %s",GetErrorMessage(r)); + __pSearchListView->SetBackgroundColor(GetBackgroundColor()); __pSearchListView->SetItemProvider(*this); __pSearchListView->SetTextOfEmptyList(CommonUtil::GetString(L"IDS_BR_BODY_NO_RESULTS_FOUND")); __pSearchListView->SetTextColorOfEmptyList(Color::GetColor(COLOR_ID_BLACK)); @@ -1064,7 +1065,7 @@ BookmarkListForm::OnKeypadClosed(Tizen::Ui::Control& source) __pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); __pListview->SetBounds(__pSearchListView->GetX(), __pSearchBar->GetY() + __pSearchBar->GetHeight(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()); __pSearchListView->Invalidate(false); - __pSearchListView->SetEnabled(true); + //__pSearchListView->SetEnabled(true); __pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight())); Invalidate(true); } diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp index 17e92e2..526a45d 100644 --- a/src/IntInternetApp.cpp +++ b/src/IntInternetApp.cpp @@ -207,6 +207,14 @@ void InternetApp::OnBackground(void) { + Frame* pCurrentFrame = null; + pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame(); + + if (pCurrentFrame != null) + { + pCurrentFrame->SetEnabled(false); + } + } void diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index 7af5d4e..6b38b33 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -3859,7 +3859,7 @@ MainForm::OnTouchReleased(Tizen::Ui::Control& source, const Tizen::Ui::TouchEven { __pAddressbar->SetShowState(true); __pAddressbar->SetAddressbarURLFocus(); - __pFooterUrlField->SetFocusable(false); +// __pFooterUrlField->SetFocusable(false); __pFooterPanel->SetShowState(false); } diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp index 43bc69a..0f9dd8c 100644 --- a/src/IntSharePopup.cpp +++ b/src/IntSharePopup.cpp @@ -363,12 +363,7 @@ SharePopup::StartEmailAppControl(void) r = pAc->Start(null, null, &extraData, this); delete pAc; } - pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame(); - if (pCurrentFrame != null && r==E_SUCCESS) - { - pCurrentFrame->SetEnabled(false); - } if (pShareInfo != null) { delete pShareInfo; @@ -460,12 +455,6 @@ SharePopup::StartMessageAppControl(void) delete pAc; } - pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame(); - - if (pCurrentFrame != null && r==E_SUCCESS) - { - pCurrentFrame->SetEnabled(false); - } if (pShareInfo != null) { delete pShareInfo; -- 2.7.4