X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Ffocus-manager%2Ffocus-manager-impl.h;h=c64d490ee9a6b04efb4a68eb63c22c827374721f;hp=c69557c2e81fda6dd14e9eece19471cdeeca6a2f;hb=fb7a84118ac4d5ddeb41f9d2d741f6aa51045ee8;hpb=9db0a074bbad5b5f1f29f22b0e39e8fb3f108a32 diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h index c69557c..c64d490 100644 --- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h +++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h @@ -1,21 +1,22 @@ #ifndef __DALI_TOOLKIT_INTERNAL_FOCUS_MANAGER_H__ #define __DALI_TOOLKIT_INTERNAL_FOCUS_MANAGER_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // EXTERNAL INCLUDES #include @@ -170,16 +171,6 @@ public: bool GetWrapMode() const; /** - * @copydoc Toolkit::FocusManager::SetEndCapFeedbackEnabled - */ - void SetEndCapFeedbackEnabled(bool enabled); - - /** - * @copydoc Toolkit::FocusManager::GetEndCapFeedbackEnabled - */ - bool GetEndCapFeedbackEnabled() const; - - /** * @copydoc Toolkit::FocusManager::SetFocusIndicatorActor */ void SetFocusIndicatorActor(Actor indicator); @@ -303,27 +294,31 @@ private: /** * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up). + * @param allowEndFeedback true if end of list feedback should be played when the focus is alread reached to the end * @return whether the accessibility action is performed or not. */ - virtual bool AccessibilityActionPrevious(); + virtual bool AccessibilityActionPrevious(bool allowEndFeedback); /** * Perform the accessibility action to move focus to the next focusable actor (by one finger flick down). + * @param allowEndFeedback true if end of list feedback should be played when the focus is alread reached to the end * @return whether the accessibility action is performed or not. */ - virtual bool AccessibilityActionNext(); + virtual bool AccessibilityActionNext(bool allowEndFeedback); /** * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick left). + * @param allowEndFeedback true if end of list feedback should be played when the focus is alread reached to the end * @return whether the accessibility action is performed or not. */ - virtual bool AccessibilityActionReadPrevious(); + virtual bool AccessibilityActionReadPrevious(bool allowEndFeedback); /** * Perform the accessibility action to move focus to the next focusable actor (by one finger flick right). + * @param allowEndFeedback true if end of list feedback should be played when the focus is alread reached to the end * @return whether the accessibility action is performed or not. */ - virtual bool AccessibilityActionReadNext(); + virtual bool AccessibilityActionReadNext(bool allowEndFeedback); /** * Perform the accessibility action to focus and read the actor (by one finger tap or move). @@ -359,6 +354,13 @@ private: */ virtual bool AccessibilityActionBack(); + /** + * Perform the accessibility action to mouse move (by one finger tap & hold and move). + * @param touchEvent touch event structure + * @return whether the accessibility action is performed or not. + */ + virtual bool AccessibilityActionTouch(const TouchEvent& touchEvent); + private: // Undefined