From 7cf93d1958176f8a0ba1b9f9c748519a13fd55a6 Mon Sep 17 00:00:00 2001 From: suhyung Eom Date: Wed, 9 Nov 2016 13:48:18 +0900 Subject: [PATCH] Add Page-UP/DOWN direction for KeyboardFocusManager Add Page-Up/DOWN direction for KeyboardFocusManager. This makes KeyboardFocusManager can move keyboard-focus towards the previous/next page direction. Signed-off-by: suhyung Eom Change-Id: Ifdaeedd256b45c72774baa64b88a87e8806f09ab --- .../internal/controls/flex-container/flex-container-impl.cpp | 4 ++++ dali-toolkit/internal/controls/popup/popup-impl.cpp | 5 +++++ dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp | 4 ++++ dali-toolkit/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 | 4 +++- .../public-api/controls/scrollable/item-view/item-layout.cpp | 4 ++++ 7 files changed, 28 insertions(+), 1 deletion(-) mode change 100755 => 100644 dali-toolkit/internal/controls/popup/popup-impl.cpp 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 1ccd840..94a92a7 100644 --- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp +++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp @@ -735,6 +735,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 old mode 100755 new mode 100644 index e59dc0c..681d6b4 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -1944,6 +1944,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 613af0a..d765df1 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 4ef642c..e6cdf3f 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 e3b0334..dea576c 100644 --- a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp @@ -1389,6 +1389,10 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolki } while ( !nextValidActor && !lastCell ); 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 f91a036..9ede92d 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -143,7 +143,9 @@ public: 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 + DOWN, ///< Move keyboard focus towards the down direction @SINCE_1_0.0 + PAGE_UP, ///< Move keyboard focus towards the previous page direction @SINCE_1_2.14 + PAGE_DOWN ///< Move keyboard focus towards the next page direction @SINCE_1_2.14 }; }; 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