From a7bbc8ea1b6f0a6741787799cc7d05e1bb342673 Mon Sep 17 00:00:00 2001 From: "vignesh.v" Date: Mon, 28 Oct 2013 15:27:36 +0530 Subject: [PATCH] Fix for N_SE-56392 Signed-off-by: vignesh.v Change-Id: I0e72851c9cb72f7e7d4c1ae7c1078d912a0ea6a3 --- src/ui/controls/FUiCtrl_Toolbar.cpp | 47 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index 77fad5c..30b5782 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -5801,10 +5801,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pItems.at(__highlightedItemIndex)->Invalidate(); - __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex; __highlighted = true; + + __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5818,10 +5818,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[LEFT_BUTTON]->Invalidate(); - __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount; __highlighted = true; + + __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5834,10 +5834,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[RIGHT_BUTTON]->Invalidate(); - __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1; __highlighted = true; + + __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5866,10 +5866,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pItems.at(__highlightedItemIndex)->Invalidate(); - __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex; __highlighted = true; + + __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5883,10 +5883,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[LEFT_BUTTON]->Invalidate(); - __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount; __highlighted = true; + + __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5918,10 +5918,9 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pItems.at(__highlightedItemIndex)->Invalidate(); - __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex; __highlighted = true; + __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5935,10 +5934,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[RIGHT_BUTTON]->Invalidate(); - __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount; __highlighted = true; + + __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5967,10 +5966,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pItems.at(__highlightedItemIndex)->Invalidate(); - __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex; __highlighted = true; + + __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -5993,10 +5992,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[LEFT_BUTTON]->Invalidate(); - __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount; __highlighted = true; + + __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -6009,10 +6008,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[RIGHT_BUTTON]->Invalidate(); - __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1; __highlighted = true; + + __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -6028,10 +6027,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[LEFT_BUTTON]->Invalidate(); - __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount; __highlighted = true; + + __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } @@ -6048,10 +6047,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL); __pButtonItems[RIGHT_BUTTON]->Invalidate(); - __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); - __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount; __highlighted = true; + + __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED); } } } -- 2.7.4