From f0b10316d02609928d5881790ab15a7f6163be18 Mon Sep 17 00:00:00 2001 From: Dongjin Jeon Date: Wed, 12 Jun 2013 15:47:25 +0530 Subject: [PATCH] modify SetTitleText return value and SetFontInfo() on Popup Change-Id: I476a0a59e1fe9972fa451de8020495e1ecc5d030 Signed-off-by: Dongjin Jeon --- src/ui/controls/FUiCtrl_PopupImpl.cpp | 5 ++++- src/ui/controls/FUiCtrl_PopupPresenter.cpp | 5 +++++ src/ui/controls/FUiCtrl_ProgressPopup.cpp | 16 ++++++++++++++++ src/ui/controls/FUiCtrl_ProgressPopupImpl.cpp | 2 +- src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp | 3 +++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/ui/controls/FUiCtrl_PopupImpl.cpp b/src/ui/controls/FUiCtrl_PopupImpl.cpp index 371e40c..b3c0920 100644 --- a/src/ui/controls/FUiCtrl_PopupImpl.cpp +++ b/src/ui/controls/FUiCtrl_PopupImpl.cpp @@ -250,7 +250,10 @@ _PopupImpl::GetColor(void) const result _PopupImpl::SetTitleText(const Tizen::Base::String& title) { - return GetCore().SetTitleText(title); + result r = GetCore().SetTitleText(title); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, r, "[%s] Propagating.", GetErrorMessage(r)); + + return r; } Tizen::Base::String diff --git a/src/ui/controls/FUiCtrl_PopupPresenter.cpp b/src/ui/controls/FUiCtrl_PopupPresenter.cpp index c31a4df..a0d8b7f 100644 --- a/src/ui/controls/FUiCtrl_PopupPresenter.cpp +++ b/src/ui/controls/FUiCtrl_PopupPresenter.cpp @@ -164,6 +164,11 @@ _PopupPresenter::OnFontInfoRequested(unsigned long& style, float& size) result _PopupPresenter::SetFontInfo(unsigned long style, float size) { + if (_fontSize == size && _fontStyle == style && _pFont != null) + { + return E_SUCCESS; + } + _fontStyle = style; _fontSize = size; diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp index ac6e79e..9982460 100644 --- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp @@ -245,12 +245,20 @@ _ProgressPopup::SetTitleText(const String& title) __pProgressPopupPresenter->SetTitleTextObject(); + r = GetLastResult(); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + if (_pTitleTextAccessibilityElement != null) { _pTitleTextAccessibilityElement->SetLabel(title); } return r; +CATCH: + _titleText = L""; + _titleState = false; + + return r; } result @@ -263,6 +271,14 @@ _ProgressPopup::SetText(const String& text) __pProgressPopupPresenter->SetTextObject(); + r = GetLastResult(); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + + return r; +CATCH: + __text = L""; + __textState = false; + return r; } diff --git a/src/ui/controls/FUiCtrl_ProgressPopupImpl.cpp b/src/ui/controls/FUiCtrl_ProgressPopupImpl.cpp index f0b806a..b58bb69 100644 --- a/src/ui/controls/FUiCtrl_ProgressPopupImpl.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopupImpl.cpp @@ -225,7 +225,7 @@ _ProgressPopupImpl::SetTitleText(const String& title) } r = GetCore().SetTitleText(title); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, r, "[%s] Propagating.", GetErrorMessage(r)); float maxHeight = 0.0f; float defaultWidth = 0.0f; diff --git a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp index 2e50312..e2ae363 100644 --- a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp @@ -190,6 +190,7 @@ _ProgressPopupPresenter::SetTitleTextObject(void) defaultWidth - (titleLeftMargin + titleRightMargin + transLeftMargin + transRightMargin), titleHeight - titleTopMargin); + SetLastResult(E_SUCCESS); return; CATCH: delete _pTitleTextObject; @@ -329,6 +330,8 @@ _ProgressPopupPresenter::SetTextObject(void) __pScrollPanel->SetBounds(__textBounds); } + SetLastResult(E_SUCCESS); + return; CATCH: delete __pBodyTextObject; -- 2.7.4