From 0090385a0ad3f9957faff094d6e4ea61d4005333 Mon Sep 17 00:00:00 2001 From: Saravana Balaji Date: Sat, 6 Apr 2013 17:37:37 +0530 Subject: [PATCH] Fix for N_SE-32342 Change-Id: Iad2fc80a4e4f1c678bd329b6a566d792104eb1c7 Signed-off-by: Saravana Balaji Signed-off-by: Ayush --- src/ui/controls/FUiCtrl_SearchBar.cpp | 1 + src/ui/controls/FUiCtrl_SearchBarPresenter.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/controls/FUiCtrl_SearchBar.cpp b/src/ui/controls/FUiCtrl_SearchBar.cpp index edbbf79..574d18d 100644 --- a/src/ui/controls/FUiCtrl_SearchBar.cpp +++ b/src/ui/controls/FUiCtrl_SearchBar.cpp @@ -1546,6 +1546,7 @@ void _SearchBar::OnChangeLayout(_ControlOrientation orientation) { SetContentsArea(); + return; } void diff --git a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp index c89a108..60b62db 100755 --- a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp @@ -374,7 +374,7 @@ _SearchBarPresenter::DrawIcon(void) GET_SHAPE_CONFIG(SEARCHBAR::ICON_HEIGHT, orientation, iconHeight); iconBounds.x = iconMarginH; - iconBounds.y = (__pEdit->GetBoundsF().height - iconWidth) / 2.0f; + iconBounds.y = (__pEdit->GetBoundsF().height - iconHeight) / 2.0f; iconBounds.width = iconWidth; iconBounds.height = iconHeight; @@ -512,6 +512,7 @@ _SearchBarPresenter::InitializeInputModeLayout(void) float buttonLeftMargin = 0.0f; float buttonWidth = 0.0f; float searchFieldMinWidth = 0.0f; + _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); GET_SHAPE_CONFIG(SEARCHBAR::HORIZONTAL_MARGIN, orientation, horizontalMargin); @@ -519,6 +520,7 @@ _SearchBarPresenter::InitializeInputModeLayout(void) GET_SHAPE_CONFIG(SEARCHBAR::BUTTON_RIGHT_MARGIN, orientation, buttonRightMargin); GET_SHAPE_CONFIG(SEARCHBAR::SEARCH_FIELD_MIN_WIDTH, orientation, searchFieldMinWidth); GET_SHAPE_CONFIG(SEARCHBAR::BUTTON_WIDTH, orientation, buttonWidth); + float buttonResizableSearchBarWidth = (horizontalMargin + searchFieldMinWidth + buttonWidth + buttonLeftMargin + buttonRightMargin); @@ -619,6 +621,7 @@ _SearchBarPresenter::OnBoundsChanged(void) } __pSearchBar->SetContentsArea(); + __pSearchBar->Invalidate(true); return; } -- 2.7.4