projects / platform / framework / native / uifw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2330daf)
fix focus for toolbar
authorMyung Jin Kim <critical.kim@samsung.com>
Tue, 18 Jun 2013 11:07:16 +0000 (20:07 +0900)
committerMyung Jin Kim <critical.kim@samsung.com>
Tue, 18 Jun 2013 11:07:16 +0000 (20:07 +0900)
Change-Id: I24e757b19d1baf07e0eb7b6abb31978986cb0f53

src/ui/controls/FUiCtrl_Toolbar.cpp patch | blob | history

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 2e4683b..45db8b5 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -5641,7 +5641,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5651,7 +5651,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5664,7 +5664,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5674,7 +5674,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5711,7 +5711,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5721,7 +5721,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5761,7 +5761,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5771,7 +5771,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5817,7 +5817,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5827,7 +5827,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5840,7 +5840,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5850,7 +5850,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5866,7 +5866,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5876,7 +5876,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5895,7 +5895,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
@@ -5905,7 +5905,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                        {
                                                                __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
 
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
                                                                __highlighted = true;
                                                        }
                                                }
Domain: UI Framework / Uncategorized;