From cc18ad40e613d1031d92ffccc64e33cbe2d57349 Mon Sep 17 00:00:00 2001 From: Taejun Date: Fri, 5 Jul 2013 15:24:45 +0900 Subject: [PATCH] Fix N_SE-44424 Change-Id: Ice1020497c20befd88db00ae3fc841f9fdd8a1f8 --- src/ui/controls/FUiCtrl_EditPresenter.cpp | 13 ++++++++++++- src/ui/controls/FUiCtrl_Keypad.cpp | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp index be93ce1..f0ea189 100755 --- a/src/ui/controls/FUiCtrl_EditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp @@ -7728,7 +7728,7 @@ _EditPresenter::AdjustParentPanelHeight(bool restore) bool isOverlapped = true; - if ((absKeypadBounds.y - commandButtonHeight) >= (absScrollPanelBounds.y + absScrollPanelBounds.height)) + if (((absKeypadBounds.y - commandButtonHeight) >= (absScrollPanelBounds.y + absScrollPanelBounds.height)) || ( absScrollPanelBounds.y > absKeypadBounds.y)) { isOverlapped = false; } @@ -7772,6 +7772,12 @@ _EditPresenter::AdjustParentPanelHeight(bool restore) { if (gapY > initialParentHeight) { + if (scrollPanelBounds.height > initialParentHeight) + { + __initialParentHeight = scrollPanelBounds.height ; + return; + } + SysLog(NID_UI_CTRL, "Set ScrollPanel's height to %f", __initialParentHeight); scrollPanelBounds.height = initialParentHeight; @@ -7784,6 +7790,11 @@ _EditPresenter::AdjustParentPanelHeight(bool restore) if (gapY > 0.0f) { + if (scrollPanelBounds.height > initialParentHeight) + { + __initialParentHeight = scrollPanelBounds.height ; + } + SysLog(NID_UI_CTRL, "Set ScrollPanel's height to %f", gapY); scrollPanelBounds.height = gapY; __pParentPanel->SetBounds(scrollPanelBounds); diff --git a/src/ui/controls/FUiCtrl_Keypad.cpp b/src/ui/controls/FUiCtrl_Keypad.cpp index 4acc884..98d0788 100755 --- a/src/ui/controls/FUiCtrl_Keypad.cpp +++ b/src/ui/controls/FUiCtrl_Keypad.cpp @@ -246,7 +246,7 @@ _Keypad::Initialize(int editStyle, _KeypadStyleInfo keypadStyleInfo, int limitLe else { indicatorwidth = _ControlManager::GetInstance()->_ControlManager::GetScreenSizeF().height; - GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, GetOrientation(), indicatorheight); + GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight); } __pIndicator->SetBounds(FloatRectangle(0.0f, 0.0f, indicatorwidth, indicatorheight)); @@ -852,7 +852,7 @@ _Keypad::OnChangeLayout(_ControlOrientation orientation) } else { - GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, GetOrientation(), indicatorheight); + GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight); __pIndicator->SetBounds(FloatRectangle(0.0f, 0.0f, landscapeSize.width, indicatorheight)); } -- 2.7.4