From ce8ad6ab637d6a656c980b82c763fc2825d0eb52 Mon Sep 17 00:00:00 2001 From: "sr.shashank" Date: Wed, 20 Mar 2013 18:18:44 +0530 Subject: [PATCH] Fix for P130226-7866. [Adjusting DateTimePicker's position] Change-Id: Ie1c1190d56e4a9bb187596bb76647dc8da463d4d Signed-off-by: sr.shashank --- src/ui/controls/FUiCtrl_DateTimePicker.cpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/ui/controls/FUiCtrl_DateTimePicker.cpp b/src/ui/controls/FUiCtrl_DateTimePicker.cpp index 752e406..ce95a61 100644 --- a/src/ui/controls/FUiCtrl_DateTimePicker.cpp +++ b/src/ui/controls/FUiCtrl_DateTimePicker.cpp @@ -359,23 +359,20 @@ FloatRectangle _DateTimePicker::GetHeaderBounds(void) { FloatRectangle headerBounds(0.0f, 0.0f, 0.0f, 0.0f); + float headerHeight = 0.0f; - if (__pHeader != null) - { - headerBounds = __pHeader->GetBoundsF(); - } - else - { - _Frame* pFrame = dynamic_cast <_Frame*>(_ControlManager::GetInstance()->GetCurrentFrame()); - SysTryReturn(NID_UI_CTRL, (pFrame != null), FloatRectangle(), E_SYSTEM, - "[E_SYSTEM] A system error has occurred. Failed to get the instance of frame."); + GET_SHAPE_CONFIG(HEADER::HEIGHT, GetOrientation(), headerHeight); - _Form* pForm = pFrame->GetCurrentForm(); - SysTryReturn(NID_UI_CTRL, (pForm != null), FloatRectangle(), E_SYSTEM, - "[E_SYSTEM] A system error has occurred. Failed to get the instance of form."); + _Frame* pFrame = dynamic_cast <_Frame*>(_ControlManager::GetInstance()->GetCurrentFrame()); + SysTryReturn(NID_UI_CTRL, (pFrame != null), FloatRectangle(), E_SYSTEM, + "[E_SYSTEM] A system error has occurred. Failed to get the instance of frame."); - headerBounds = pForm->GetIndicatorBoundsF(); - } + _Form* pForm = pFrame->GetCurrentForm(); + SysTryReturn(NID_UI_CTRL, (pForm != null), FloatRectangle(), E_SYSTEM, + "[E_SYSTEM] A system error has occurred. Failed to get the instance of form."); + + headerBounds = pForm->GetIndicatorBoundsF(); + headerBounds.height += headerHeight; return headerBounds; } -- 2.7.4