From e2850a6fce92ce3a1a3469e368f079705f4aeb12 Mon Sep 17 00:00:00 2001 From: kishorekumar Dachinamoorthy Date: Sun, 24 Mar 2013 17:20:40 +0530 Subject: [PATCH] Implementation of minimum size changes for slider, progress controls. Change-Id: Ic8d962f3c16a36391bab4475e3b3d97f099e1c39 --- src/ui/controls/FUiCtrl_ProgressPresenter.cpp | 9 ++--- src/ui/controls/FUiCtrl_SliderPresenter.cpp | 50 +++++++++++++------------- src/ui/resource/FUi_ResourceProgressConfig.cpp | 6 ++-- src/ui/resource/FUi_ResourceSliderConfig.cpp | 18 +++++----- 4 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/ui/controls/FUiCtrl_ProgressPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPresenter.cpp index 7bb21ea..738f07a 100755 --- a/src/ui/controls/FUiCtrl_ProgressPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPresenter.cpp @@ -274,7 +274,6 @@ _ProgressPresenter::Draw(void) float height = 0.0f; int opacity = 0; float leftMargin = 0.0f; - float topMargin = 0.0f; float minimumWidth = 0.0f; float minimumHeight = 0.0f; float offset = 0.0f; @@ -291,16 +290,14 @@ _ProgressPresenter::Draw(void) r = GET_SHAPE_CONFIG(PROGRESS::BAR_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, leftMargin); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(PROGRESS::MINIMUM_SIZE, _CONTROL_ORIENTATION_PORTRAIT, minimumWidth); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - - r = GET_SHAPE_CONFIG(PROGRESS::BAR_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, topMargin); + r = GET_SHAPE_CONFIG(PROGRESS::MINIMUM_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, minimumWidth); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); r = GET_SHAPE_CONFIG(PROGRESS::BAR_OFFSET, _CONTROL_ORIENTATION_PORTRAIT, offset); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - minimumHeight = 2.0f * topMargin + height; + r = GET_SHAPE_CONFIG(PROGRESS::MINIMUM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, minimumHeight); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); if (bounds.width < minimumWidth) { diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp index 5f7c2c0..029937e 100644 --- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp @@ -249,6 +249,7 @@ _SliderPresenter::Resize(void) float minimumWidth = 0.0f; float topMargin = 0.0f; float iconRightMargin = 0.0f; + float titleHeight = 0.0f; FloatRectangle titleTextBounds; _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); @@ -281,11 +282,6 @@ _SliderPresenter::Resize(void) r = GET_SHAPE_CONFIG(SLIDER::BAR_HEIGHT, orientation, barHeight); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(SLIDER::BAR_LEFT_MARGIN, orientation, barLeftMargin); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - - barRightMargin = barLeftMargin; - r = GET_SHAPE_CONFIG(SLIDER::ICON_WIDTH, orientation, iconWidth); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -313,35 +309,42 @@ _SliderPresenter::Resize(void) if ((__pSlider->GetIcon(ICON_POSITION_LEFT) != null) || (__pSlider->GetIcon(ICON_POSITION_RIGHT) != null)) { - r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_SIZE_WITH_ICON, orientation, minimumWidth); + r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_WIDTH_WITH_ICON, orientation, minimumWidth); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - if (__rect.width < minimumWidth) - { - __rect.width = minimumWidth; - } + r = GET_SHAPE_CONFIG(SLIDER::BAR_LEFT_MARGIN_WITH_ICON, orientation, barLeftMargin); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } else { - r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_SIZE_WITHOUT_ICON, orientation, minimumWidth); + r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_WIDTH_WITHOUT_ICON, orientation, minimumWidth); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - if (__rect.width < minimumWidth) - __rect.width = minimumWidth; + r = GET_SHAPE_CONFIG(SLIDER::BAR_LEFT_MARGIN, orientation, barLeftMargin); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } + barRightMargin = barLeftMargin; + + if (__rect.width < minimumWidth) + { + __rect.width = minimumWidth; + } + + r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_HEIGHT, orientation, minimumHeight); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + if (__pSlider->GetStyle() & _SLIDER_STYLE_TITLE_TEXT) { - r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_SIZE, orientation, minimumHeight); - minimumHeight = minimumHeight + (2.0f * topMargin) + barHeight; - if (__rect.height < minimumHeight ) - __rect.height = minimumHeight; + r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_HEIGHT, orientation, titleHeight); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + minimumHeight = minimumHeight + titleHeight; } - else + + if (__rect.height < minimumHeight ) { - minimumHeight = (2.0f * topMargin) + barHeight; - if (__rect.height < minimumHeight) - __rect.height = minimumHeight; + __rect.height = minimumHeight; } if (__pSlider->GetStyle() & _SLIDER_STYLE_TITLE_TEXT) @@ -1379,13 +1382,10 @@ _SliderPresenter::GetTitleTextBounds(void) const r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_POSITION_X, orientation, titleTextBounds.x); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, FloatRectangle(), r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_POSITION_Y, orientation, titleTextBounds.y); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, FloatRectangle(), r, "[%s] Propagating.", GetErrorMessage(r)); - r = GET_SHAPE_CONFIG(SLIDER::BAR_TOP_MARGIN, orientation, topMargin); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, FloatRectangle(), r, "[%s] Propagating.", GetErrorMessage(r)); - titleTextBounds.y = titleTextBounds.y + topMargin; + titleTextBounds.y = topMargin; r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_HEIGHT, orientation, titleTextBounds.height); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, FloatRectangle(), r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/resource/FUi_ResourceProgressConfig.cpp b/src/ui/resource/FUi_ResourceProgressConfig.cpp index 2905884..873069f 100644 --- a/src/ui/resource/FUi_ResourceProgressConfig.cpp +++ b/src/ui/resource/FUi_ResourceProgressConfig.cpp @@ -35,11 +35,11 @@ START_UI_CONFIG(PROGRESS); START_UI_CONFIG_MODE(720x1280); { ADD_SHAPE_CONFIG(BAR_HEIGHT, 36); - ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 26); - ADD_SHAPE_CONFIG(BAR_TOP_MARGIN, 12); + ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 36); ADD_SHAPE_CONFIG(BAR_OFFSET, 9); - ADD_SHAPE_CONFIG(MINIMUM_SIZE, 276); + ADD_SHAPE_CONFIG(MINIMUM_WIDTH, 276); + ADD_SHAPE_CONFIG(MINIMUM_HEIGHT, 68); } END_UI_CONFIG_MODE(720x1280); } diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp index a691dff..6480072 100644 --- a/src/ui/resource/FUi_ResourceSliderConfig.cpp +++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp @@ -73,19 +73,19 @@ START_UI_CONFIG(SLIDER); ADD_SHAPE_CONFIG(HANDLE_THREE_DIGIT_TEXT_SIZE, 26); ADD_SHAPE_CONFIG(BAR_HEIGHT, 36); - ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 26); - ADD_SHAPE_CONFIG(BAR_TOP_MARGIN, 12); + ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 26); + ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 36); + ADD_SHAPE_CONFIG(BAR_TOP_MARGIN, 16); ADD_SHAPE_CONFIG(BAR_OFFSET, 9); - ADD_SHAPE_CONFIG(ICON_WIDTH, 74); - ADD_SHAPE_CONFIG(ICON_HEIGHT, 74); + ADD_SHAPE_CONFIG(ICON_WIDTH, 72); + ADD_SHAPE_CONFIG(ICON_HEIGHT, 72); ADD_SHAPE_CONFIG(ICON_LEFT_MARGIN, 26); ADD_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 16); ADD_SHAPE_CONFIG(TITLE_TEXT_POSITION_X, 12); - ADD_SHAPE_CONFIG(TITLE_TEXT_POSITION_Y, 12); ADD_SHAPE_CONFIG(TITLE_TEXT_SIZE, 32); - ADD_SHAPE_CONFIG(TITLE_TEXT_HEIGHT, 36); + ADD_SHAPE_CONFIG(TITLE_TEXT_HEIGHT, 49); ADD_SHAPE_CONFIG(OVERLAY_WIDTH, 90); ADD_SHAPE_CONFIG(OVERLAY_HEIGHT, 108); @@ -101,8 +101,10 @@ START_UI_CONFIG(SLIDER); ADD_SHAPE_CONFIG(NUMBER_SIZE, 58); ADD_SHAPE_CONFIG(TEXT_SIZE, 28); - ADD_SHAPE_CONFIG(MINIMUM_SIZE_WITHOUT_ICON, 276); - ADD_SHAPE_CONFIG(MINIMUM_SIZE_WITH_ICON, 510); + ADD_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 276); + ADD_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 510); + + ADD_SHAPE_CONFIG(MINIMUM_HEIGHT, 68); } END_UI_CONFIG_MODE(720x1280); -- 2.7.4