From 9fcd188d7e67162aae18fcc6617c01a5a80f4042 Mon Sep 17 00:00:00 2001 From: DongJinJeon Date: Sat, 13 Apr 2013 01:26:19 +0900 Subject: [PATCH] modify default text height of ProgressPoup and MessageBox Change-Id: I9580c8f2f306ee06c767c3958a936ee8f45aec7e Signed-off-by: DongJinJeon --- src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp | 5 ++--- src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp | 5 ++--- src/ui/inc/FUiCtrl_MessageBoxPresenter.h | 1 - src/ui/inc/FUiCtrl_ProgressPopupPresenter.h | 1 - src/ui/inc/FUi_ResourceMessageBoxConfig.h | 1 + src/ui/inc/FUi_ResourcePopupConfig.h | 3 ++- src/ui/resource/FUi_ResourceMessageBoxConfig.cpp | 1 + src/ui/resource/FUi_ResourcePopupConfig.cpp | 1 + 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp index 203181c..4bbae85 100644 --- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp +++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp @@ -256,6 +256,7 @@ _MessageBoxPresenter::Initialize(_MessageBox& msgbox) GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_TEXT_SIZE, orientation, titleTextSize); GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_SIZE, orientation, bodyTextSize); + GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_HEIGHT, orientation, __textObjHeight); GET_SHAPE_CONFIG(MESSAGEBOX::DEFAULT_WIDTH, orientation, defaultWidth); GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_HEIGHT, orientation, titleHeight); @@ -341,8 +342,6 @@ _MessageBoxPresenter::Initialize(_MessageBox& msgbox) maxHeight - titleHeight)); __pBodyTextObject->Compose(); - __textObjHeight = TEXT_OBJ_HEIGHT; - // Text bounds __textBounds.SetBounds(textLeftMargin + transLeftMargin, titleHeight + textTopMargin + transTopMargin, @@ -924,7 +923,7 @@ _MessageBoxPresenter::CalculateButtonAreaHeight(void) float _MessageBoxPresenter::GetBodyTextObjHeight(void) const { - return __textObjHeight; + return (__pBodyTextObject == null) ? 0.0f : __textObjHeight; } float _MessageBoxPresenter::GetBodyTextHeight(void) const diff --git a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp index a435dc8..dc48802 100755 --- a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp @@ -102,8 +102,6 @@ _ProgressPopupPresenter::Initialize(_ProgressPopup& ProgressPopup, bool cancelBu __cancelButton = cancelButton; __transparent = transparent; __pProgressPopup = &ProgressPopup; - __textObjectHeight = TEXT_OBJ_HEIGHT; - return r; } @@ -218,6 +216,7 @@ _ProgressPopupPresenter::SetTextObject(void) GET_SHAPE_CONFIG(POPUP::PROCESS_TEXT_TOP_MARGIN, orientation, textTopMargin); GET_SHAPE_CONFIG(POPUP::PROCESS_TEXT_BOTTOM_MARGIN, orientation, textBottomMargin); + GET_SHAPE_CONFIG(POPUP::BODY_TEXT_HEIGHT, orientation, __textObjectHeight); GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_LEFT_MARGIN, orientation, textLeftMargin); GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_RIGHT_MARGIN, orientation, textRightMargin); GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_SIZE, orientation, bodyTextSize); @@ -528,7 +527,7 @@ _ProgressPopupPresenter::DoModal(int& modalResult) float _ProgressPopupPresenter::GetBodyTextObjHeight(void) const { - return __textObjectHeight; + return (__pBodyTextObject == null) ? 0.0f : __textObjectHeight; } float _ProgressPopupPresenter::GetBodyTextHeight(void) const diff --git a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h index bd9016c..a4402d6 100644 --- a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h +++ b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h @@ -172,7 +172,6 @@ private: int __buttonNum; float __prevPositionY; float __textObjHeight; - static const float TEXT_OBJ_HEIGHT = 210.0f; bool __touchPressFlag; bool __scrollStart; diff --git a/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h b/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h index d872127..83ea5ba 100644 --- a/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h +++ b/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h @@ -119,7 +119,6 @@ private: bool __transparent; static const int ANIMATION_REPEAT_COUNT = 100; - static const float TEXT_OBJ_HEIGHT = 160.0f; }; // _ProgressPopupPresenter diff --git a/src/ui/inc/FUi_ResourceMessageBoxConfig.h b/src/ui/inc/FUi_ResourceMessageBoxConfig.h index 8017a24..9a30d42 100755 --- a/src/ui/inc/FUi_ResourceMessageBoxConfig.h +++ b/src/ui/inc/FUi_ResourceMessageBoxConfig.h @@ -57,6 +57,7 @@ DECLARE_UI_CONFIG(MESSAGEBOX); DECLARE_SHAPE_CONFIG(BUTTON_SIDE_MARGIN_01, 24); DECLARE_SHAPE_CONFIG(BUTTON_SIDE_MARGIN_02, 25); DECLARE_SHAPE_CONFIG(BUTTON_SIDE_MARGIN_03, 26); + DECLARE_SHAPE_CONFIG(TEXT_HEIGHT, 27); DECLARE_END_UI_CONFIG(MESSAGEBOX); #endif //_FUI_RESOURCE_MESSAGEBOX_CONFIG_H_ diff --git a/src/ui/inc/FUi_ResourcePopupConfig.h b/src/ui/inc/FUi_ResourcePopupConfig.h index de8cf75..d8ca450 100755 --- a/src/ui/inc/FUi_ResourcePopupConfig.h +++ b/src/ui/inc/FUi_ResourcePopupConfig.h @@ -53,5 +53,6 @@ DECLARE_UI_CONFIG(POPUP); DECLARE_SHAPE_CONFIG(BG_OUTLINE_EFFECT_BOTTOM_MARGIN, 19); DECLARE_SHAPE_CONFIG(BG_OUTLINE_EFFECT_LEFT_MARGIN, 20); DECLARE_SHAPE_CONFIG(BG_OUTLINE_EFFECT_RIGHT_MARGIN, 21); + DECLARE_SHAPE_CONFIG(BODY_TEXT_HEIGHT, 22); DECLARE_END_UI_CONFIG(POPUP); -#endif //_FUI_RESOURCE_POPUP_CONFIG_H_ \ No newline at end of file +#endif //_FUI_RESOURCE_POPUP_CONFIG_H_ diff --git a/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp b/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp index 2e3edd7..e08bf0a 100755 --- a/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp +++ b/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp @@ -56,6 +56,7 @@ START_UI_CONFIG(MESSAGEBOX); ADD_SHAPE_CONFIG(BOTTOM_HEIGHT, 118); // 20130403 ADD_SHAPE_CONFIG(TEXT_SIZE, 38); // 20130403 + ADD_SHAPE_CONFIG(TEXT_HEIGHT, 88); // 20130403 ADD_SHAPE_CONFIG(TEXT_LEFT_MARGIN, 29); // 20130403 ADD_SHAPE_CONFIG(TEXT_RIGHT_MARGIN, 29); // 20130403 diff --git a/src/ui/resource/FUi_ResourcePopupConfig.cpp b/src/ui/resource/FUi_ResourcePopupConfig.cpp index 29dbba4..d2688dd 100755 --- a/src/ui/resource/FUi_ResourcePopupConfig.cpp +++ b/src/ui/resource/FUi_ResourcePopupConfig.cpp @@ -84,6 +84,7 @@ START_UI_CONFIG(POPUP); ADD_SHAPE_CONFIG(TITLE_TEXT_TOP_MARGIN, 20); //20130403 ADD_SHAPE_CONFIG(TITLE_TEXT_LEFT_MARGIN, 29); //20130403 ADD_SHAPE_CONFIG(TITLE_TEXT_RIGHT_MARGIN, 29); //20130403 + ADD_SHAPE_CONFIG(BODY_TEXT_HEIGHT, 88); //20130403 ADD_SHAPE_CONFIG(TOP_BORDER, 6); // Compatibility 2.0 ADD_SHAPE_CONFIG(BOTTOM_BORDER, 30); // Compatibility 2.0 -- 2.7.4