From a95f788a2b5b571e246656c847eddbf40af9a130 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Fri, 7 Apr 2017 00:20:08 +0900 Subject: [PATCH] [3.0] Add Page-UP/DOWN direction for KeyboardFocusManager Change-Id: Ia2bad014cfd94e5202ae5a256c10c49884ef6d54 Signed-off-by: minho.sun --- .../internal/controls/flex-container/flex-container-impl.cpp | 4 ++++ dali-toolkit/internal/controls/popup/popup-impl.cpp | 5 +++++ .../internal/controls/scrollable/item-view/depth-layout.cpp | 4 ++++ .../internal/controls/scrollable/item-view/grid-layout.cpp | 4 ++++ dali-toolkit/internal/controls/table-view/table-view-impl.cpp | 4 ++++ dali-toolkit/public-api/controls/control.h | 10 ++++++---- .../public-api/controls/scrollable/item-view/item-layout.cpp | 4 ++++ 7 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp index c520ede..01cbd5a 100644 --- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp +++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp @@ -730,6 +730,10 @@ Actor FlexContainer::GetNextKeyboardFocusableActor(Actor currentFocusedActor, To } while ( !mChildrenNodes[nextFocusedActorIndex].actor.GetHandle().IsKeyboardFocusable() ); break; } + default: + { + break; + } } if( nextFocusedActorIndex != currentFocusedActorIndex ) diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 7c0233f..2ec3e8f 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -1880,6 +1880,11 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit:: nextFocusableActor = *( endIterator - 1 ); break; } + + default: + { + break; + } } if( !nextFocusableActor ) diff --git a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp index 557a089..e650602 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp @@ -599,6 +599,10 @@ int DepthLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Con } break; } + default: + { + break; + } } return itemID; } diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp index e1ca4d0..666fd2f 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp @@ -699,6 +699,10 @@ int GridLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Cont } break; } + default: + { + break; + } } return itemID; } diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp index 4a655aa..ac3812e 100644 --- a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp @@ -1366,6 +1366,10 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolki } break; } + default: + { + break; + } } // Move the focus if we haven't lost it. diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index fc994aa..0053080 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -140,10 +140,12 @@ public: */ enum Direction { - LEFT, ///< Move keyboard focus towards the left direction @SINCE_1_0.0 - RIGHT, ///< Move keyboard focus towards the right direction @SINCE_1_0.0 - UP, ///< Move keyboard focus towards the up direction @SINCE_1_0.0 - DOWN ///< Move keyboard focus towards the down direction @SINCE_1_0.0 + LEFT, ///< Move keyboard focus towards the left direction @SINCE_1_0.0 + RIGHT, ///< Move keyboard focus towards the right direction @SINCE_1_0.0 + UP, ///< Move keyboard focus towards the up direction @SINCE_1_0.0 + DOWN, ///< Move keyboard focus towards the down direction @SINCE_1_0.0 + PAGE_UP, ///< Move keyboard focus towards the previous page direction @SINCE_1_1.46 + PAGE_DOWN ///< Move keyboard focus towards the next page direction @SINCE_1_1.46 }; }; diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index 0dc2bb4..2e7ddee 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -119,6 +119,10 @@ int ItemLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Cont } break; } + default: + { + break; + } } return itemID; } -- 2.7.4