}
-void Box::OnActivated()
+bool Box::OnAccessibilityActivated()
{
VIEWER_DBG("box activated");
Actor self = Self();
if (mIsDisappearing || mIsClicking || mIsFlicking || mIsBlockingOperation || !mSignalTapConnected)
- return;
+ {
+ return false;
+ }
if (mIsFaultReloading == false)
{
}
}
+ return true;
}
bool Box::OnFaultReloadingTimerComplete()
virtual void OnSetFaultReloading(bool isReloading) {}
// for screen reader
- virtual void OnActivated();
+ virtual bool OnAccessibilityActivated();
#ifdef _ENABLE_DROP_VIEW_
/**
* @copydoc Toolkit::Control::OnPan()
void Cluster::UpdateScreenReader(void)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
char buf[1024] = { 0, };
snprintf(buf, sizeof(buf), _("IDS_HS_BODY_PAGE_P1SD_OF_P2SD"), GetFocusedPage(), GetPageCount());
if (aPageIndiActor)
{
focusManager.SetFocusOrder(aPageIndiActor, order++);
- focusManager.SetAccessibilityAttribute(aPageIndiActor, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, buf);
+ focusManager.SetAccessibilityAttribute(aPageIndiActor, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, buf);
}
}
// toolbar
}
-Actor Cluster::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor Cluster::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
VIEWER_ERR("virtual function, do not call this function directly");
* Keyboard focus
* @return next focusable actor if view's child should be focused
*/
- virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
bool KeyClicked(HomeScreenKeyType eKeyType);
CHomeScreenViewManager::GetInstance()->GetSignalKeyEvent().Connect(this, &ClusterViewController::_OnKeyEvent);
CHomeScreenViewManager::GetInstance()->GetSignalScreenViewTypeChanged().Connect(this, &ClusterViewController::_OnScreenViewTypeChanged);
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.FocusedActorActivatedSignal().Connect(this, &ClusterViewController::_OnTTSFocusedActorActivated);
focusManager.FocusChangedSignal().Connect(this, &ClusterViewController::_OnTTSFocusChanged);
void ClusterViewController::UpdateScreenReader(void)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
ClusterHome3D::Accessibility *cHomeAccessibility = ClusterHome3D::Accessibility::Get();
unsigned int nFocusUpdateType = cHomeAccessibility->GetFocusUpdateType();
CustomBox customBox = customCluster.GetBox(boxId);
if (customBox)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
if (customBox)
{
if (isFocused)
// inner box
VIEWER_DBG("Focus to box layout");
focusManager.SetFocusOrder(m_cAccessCustomBox, BASE_FOCUS_ORDER_BOX_INNER);
- focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_cAccessCustomBox.GetDescription());
- focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_DYNAMIC_BOX"));
+ focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_cAccessCustomBox.GetDescription());
+ focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_DYNAMIC_BOX"));
focusManager.SetCurrentFocusActor(m_cAccessCustomBox);
m_bBlockPrevEvent = true;
if (CHomeScreenViewManager::GetInstance()->GetCurrentViewType() == HOME_SCREEN_VIEW)
{
// clear focus
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.ClearFocus();
if (mClusterView)
}
}
- mFocusedCluster.TabKeyClicked(clickedShift);
- nextFocusActor = kbdFocusManager.GetCurrentFocusActor();
-
- if(currentFocusedActor != nextFocusActor)
- {
- VIEWER_ERR("[%d] next focus actor from cluster", nextFocusActor.GetId());
- }
- else
- {
- mClusterView.TabKeyClicked(clickedShift);
- nextFocusActor = kbdFocusManager.GetCurrentFocusActor();
- if(currentFocusedActor != nextFocusActor)
- {
- VIEWER_ERR("[%d] next focus actor from cluster", nextFocusActor.GetId());
- }
- else
- {
- currentFocusedActor = nextFocusActor;
- if(clickedShift)
- {
- nextFocusActor = QueryNextFocusActor(currentFocusedActor, nextFocusActor, Dali::Toolkit::Control::Up);
- }
- else
- {
- nextFocusActor = QueryNextFocusActor(currentFocusedActor, nextFocusActor, Dali::Toolkit::Control::Down);
- }
- kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
- if(nextFocusActor == currentFocusedActor)
- {
- }
- }
- }
+ customCluster.TabKeyClicked(clickedShift);
}
void ClusterViewController::BackKeyClicked(void)
void ClusterViewController::SetAccessibilityActionEventForBox(CustomBox box)
{
// reset all focus
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.Reset();
focusManager.ClearFocus();
// focus to box
focusManager.SetFocusOrder(m_cAccessCustomBox, BASE_FOCUS_ORDER_BOX_INNER);
- focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::FocusManager::ACCESSIBILITY_LABEL, box.GetDescription());
- focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_DYNAMIC_BOX"));
+ focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, box.GetDescription());
+ focusManager.SetAccessibilityAttribute(m_cAccessCustomBox, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_DYNAMIC_BOX"));
m_bBlockPrevEvent = true;
}
}
void ClusterViewController::_OnTTSFocusedActorActivated(Actor aActivatedActor)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
int nFocusOrder = focusManager.GetFocusOrder(aActivatedActor);
VIEWER_DBG("_OnTTSFocusedActorActivated[%d]", nFocusOrder);
void ClusterViewController::_OnTTSFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
unsigned int nFocusedActorOrder = focusManager.GetFocusOrder(currentFocusedActor);
VIEWER_DBG("_OnTTSFocusChanged Order[%d]", nFocusedActorOrder);
void ClusterViewController::OnOptionButtonClicked(ClusterHome3D::ClusterView::OptionType type)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
ClusterHome3D::Accessibility *homeAccessibility = ClusterHome3D::Accessibility::Get();
switch (type)
if (cPrevCustomBox)
{
VIEWER_DBG("Move focus to Box[%d]", cPrevCustomBox.GetId());
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.SetCurrentFocusActor(cPrevCustomBox);
}
else
if (cPrevCustomBox)
{
VIEWER_DBG("Move focus to Box[%d]", cPrevCustomBox.GetId());
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.SetCurrentFocusActor(cPrevCustomBox);
}
else
}
-Actor ClusterViewController::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor ClusterViewController::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
switch(direction)
{
// Up direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
{
TEST_DBG("Move a down box[%d]", direction);
}
void AccessibilityFontSizeChanged(void);
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
/**
* Signals From IClusterWidgetObserver
// kbdFocusManager.SetCurrentFocusActor(mTop2PhoneButton);
}
-bool ClusterView::TabKeyClicked(bool clickedShift, bool flagInit){
- Actor currentFocusedActor;
- Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
- currentFocusedActor = kbdFocusManager.GetCurrentFocusActor();
-
- return false;
-}
-
-
void ClusterView::TabKeyClicked(bool clickedShift)
{
Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
}
}
-Actor ClusterView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor ClusterView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
* Keyboard focus
* @return next focusable actor if view's child should be focused
*/
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
- // Click a tabkey
- bool TabKeyClicked(bool,bool);
void TabKeyClicked(bool clickedShift);
void InitKeyboardFocus();
{
GetImpl(*this).UpdateScreenReader();
}
-Actor ClusterView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor ClusterView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
-bool ClusterView::TabKeyClicked(bool clickedShift, bool flagInit)
-{
- return GetImpl(*this).TabKeyClicked(clickedShift, flagInit);
-}
-
void ClusterView::TabKeyClicked(bool clickedShift)
{
GetImpl(*this).TabKeyClicked(clickedShift);
* Keyboard focus
* @return next focusable actor if view's child should be focused
*/
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
- // Click a tabkey
- bool TabKeyClicked(bool,bool);
void TabKeyClicked(bool clickedShift);
- void InitKeyboardFocus();
+ void InitKeyboardFocus();
public: // Not intended for application developers
GetImpl(*this).UpdateScreenReader();
}
-Actor Cluster::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor Cluster::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
* Keyboard focus
* @return next focusable actor if view's child should be focused
*/
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
// key event
virtual bool KeyClicked(HomeScreenKeyType eKeyType);
}
}
#endif
+
void CustomBox::UpdateIcon(const string filePath)
{
// only available icon
if (mCustomBoxType == CUSTOM_WIDGET_APPLICATION || mCustomBoxType == CUSTOM_WIDGET_SHORTCUT)
{
Actor self = Self();
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_LABEL, mDescription);
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, mDescription);
}
if(m_CUtilTextImgFault)
void CustomBox::UpdateScreenReader(void)
{
Actor self = Self();
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
unsigned int order = ((mBoxPositionInfo.x * CUSTOM_GRID_MAX_COL + mBoxPositionInfo.y) + mBoxPositionInfo.z * CUSTOM_GRID_MAX_ROW * CUSTOM_GRID_MAX_COL) * 100;
if (mCustomBoxType == CUSTOM_WIDGET_APPLICATION || mCustomBoxType == CUSTOM_WIDGET_SHORTCUT)
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_LABEL, mDescription);
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_DYNAMIC_BOX"));
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_VALUE, _("IDS_HS_BODY_DOUBLE_TAP_AND_HOLD_TO_MOVE_T_TTS"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, mDescription);
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_DYNAMIC_BOX"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_VALUE, _("IDS_HS_BODY_DOUBLE_TAP_AND_HOLD_TO_MOVE_T_TTS"));
}
if (mBadgeCount > 1)
{
char buf[1024] = { 0, };
snprintf(buf, sizeof(buf), _("IDS_SCR_BODY_PD_UNREAD_ITEMS"), mBadgeCount);
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_HINT, buf);
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, buf);
}
else if (mBadgeCount == 1)
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_SCR_BODY_1_UNREAD_ITEM"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_SCR_BODY_1_UNREAD_ITEM"));
}
else
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_HINT, "");
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, "");
}
VIEWER_DBG("[TTS] CustomBox[%d], focus order[%d], badge[%d]", GetId(), order, mBadgeCount);
if (mDeleteButton)
{
focusManager.SetFocusOrder(mDeleteButton, order + 1);
- focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_BODY_DELETE_OPT_TTS"));
- focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_BODY_DELETE_OPT_TTS"));
+ focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
// propagate
if (mBoxImageType == BOX_IMAGE_PIXMAP || mBoxImageType == BOX_IMAGE_BUFFER)
{
#ifdef _WIDGET_AUTO_FEED
-
//Vector3 baseSize = mBaseImage.GetCurrentSize();
Actor self = Self();
Vector3 touchInfo = GetScreenPosition(self);
-
touchInfo.z = float(event.GetPoint(0).state);
-
-
- VIEWER_DBG("box position %.2f, %.2f, %.2f", touchInfo.x, touchInfo.y, touchInfo.z );
ClusterHome3D::Box handle(GetOwner());
Vector3 baseSize = mPickEventBox.GetCurrentSize();
default:
break;
}
-
- VIEWER_DBG("box touch event (%d)", (int)event.GetPoint(0).state);
mTouchedSignal.Emit(handle, touchInfo);
#else
Actor self = Self();
mTouchedSignal.Emit(handle, touchInfo);
#endif
-
}
}
void CustomCluster::SetCurrentTTSMode(void)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
ClusterHome3D::Accessibility *homeAccessibility = ClusterHome3D::Accessibility::Get();
if (!homeAccessibility->GetTTSMode())
{
mIdExistDndContent = false;
// accessibility
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.FocusChangedSignal().Connect(this, &Internal::CustomCluster::OnFocusChanged);
focusManager.FocusOvershotSignal().Connect(this, &Internal::CustomCluster::OnFocusOvershot);
focusManager.FocusedActorActivatedSignal().Connect(this, &Internal::CustomCluster::OnFocusedActorActivated);
}
// Focus a last Actor
- if(lastFocusActor){
+ if(mLastFocusActor){
Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
- kbdFocusManager.SetCurrentFocusActor(lastFocusActor);
+ kbdFocusManager.SetCurrentFocusActor(mLastFocusActor);
}
// cancel operation of page indicator
if(flagFind == true){
Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
- lastFocusActor = nextFocusActor;
+ mLastFocusActor = nextFocusActor;
}
else{
mMoveKeyboardFocusBottom.Emit();
void CustomCluster::OnUpdateScreenReader(void)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
ClusterHome3D::Accessibility *homeAccessibility = ClusterHome3D::Accessibility::Get();
unsigned int nFocusUpdateType = homeAccessibility->GetFocusUpdateType();
unsigned int nFocusGroup = homeAccessibility->GetCurrentGroup();
if (mAddPageButton)
{
focusManager.SetFocusOrder(mAddPageButton, BASE_FOCUS_ORDER_PAGE + (mPages.size() + 5) * 10);
- focusManager.SetAccessibilityAttribute(mAddPageButton, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_TTS_BUTTON_ADD_PAGE"));
- focusManager.SetAccessibilityAttribute(mAddPageButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(mAddPageButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_TTS_BUTTON_ADD_PAGE"));
+ focusManager.SetAccessibilityAttribute(mAddPageButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
VIEWER_DBG("AddPage order[%d]", BASE_FOCUS_ORDER_PAGE + (mPages.size() + 5) * 10);
}
if (!firstBox)
{
focusManager.SetFocusOrder(page, BASE_FOCUS_ORDER_PAGE + nFocusedPage);
- focusManager.SetAccessibilityAttribute(page, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_NO_CONTENT"));
+ focusManager.SetAccessibilityAttribute(page, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_NO_CONTENT"));
}
}
}
void CustomCluster::OnFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
VIEWER_DBG("OnFocusChanged[%d]", focusManager.GetFocusOrder(currentFocusedActor));
ClusterHome3D::CustomBox box = ClusterHome3D::CustomBox::DownCast(currentFocusedActor);
}
}
-void CustomCluster::OnFocusOvershot(Actor currentFocusedActor, Toolkit::FocusManager::FocusOvershotDirection direction)
+void CustomCluster::OnFocusOvershot(Actor currentFocusedActor, Toolkit::AccessibilityFocusManager::FocusOvershotDirection direction)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
VIEWER_DBG("OnFocusOvershot[%d]", focusManager.GetFocusOrder(currentFocusedActor));
ClusterHome3D::Accessibility *homeAccessibility = ClusterHome3D::Accessibility::Get();
if (focusGroup == FOCUS_GROUP_BOX && !homeAccessibility->GetTTSMode())
{
// while keyboard mode, move page
- if (direction == Toolkit::FocusManager::OVERSHOT_PREVIOUS)
+ if (direction == Toolkit::AccessibilityFocusManager::OVERSHOT_PREVIOUS)
{
// go to prev page
int focusedPage = GetFocusedPage();
// to set focused box of next page, reset this
mLastFocusedBox.Reset();
}
- else if (direction == Toolkit::FocusManager::OVERSHOT_NEXT)
+ else if (direction == Toolkit::AccessibilityFocusManager::OVERSHOT_NEXT)
{
// go to next page
int focusedPage = GetFocusedPage();
void CustomCluster::OnFocusedActorActivated(Actor activatedActor)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
int focusOrder = focusManager.GetFocusOrder(activatedActor);
VIEWER_DBG("OnFocusedActorActivated[%d]", focusOrder);
return mPages.size();
}
-bool CustomCluster::TabKeyClicked(bool clickedShift, bool flagInit)
-{
- Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
-
- VIEWER_DBG("TabKeyClicked");
-
- CustomBoxContainer::iterator boxIter;
-
- Actor nextFocusActor;
- int nowX, nowY;
-
- int posValue;
- int prevValue;
- int nowValue;
-
- bool flagFind;
-
- if(!lastFocusActor || flagInit == true){
- if(clickedShift == true){
- posValue = (CUSTOM_GRID_MAX_COL+1)*CUSTOM_GRID_MAX_ROW+1;
- }
- else{
- posValue = -1;
- }
-
- }
- else{
- Actor currentActor = kbdFocusManager.GetCurrentFocusActor();
-
- if(lastFocusActor != currentActor){
- return false;
- }
-
- // currentFocusedBox position
- ClusterHome3D::CustomBox currentFocusedBox = ClusterHome3D::CustomBox::DownCast(lastFocusActor);
- int currentFocusedBoxX = (int)currentFocusedBox.GetBoxPositionInfo().x;
- int currentFocusedBoxY = (int)currentFocusedBox.GetBoxPositionInfo().y;
-
- posValue = currentFocusedBoxX*CUSTOM_GRID_MAX_COL + currentFocusedBoxY;
- }
-
-
- // Find a next actor.
- flagFind = false;
-
- // Shift + Tab
- if(clickedShift == true){
- prevValue = -1;
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == GetFocusedPage()){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowValue = nowX*CUSTOM_GRID_MAX_COL + nowY;
-
- if(nowValue < posValue && nowValue > prevValue){
- prevValue = nowValue;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
- }
- }
- }
- else {
- prevValue = (CUSTOM_GRID_MAX_COL+1)*CUSTOM_GRID_MAX_ROW+1;
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == GetFocusedPage()){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowValue = nowX*CUSTOM_GRID_MAX_COL + nowY;
-
- if(nowValue > posValue && nowValue < prevValue){
- prevValue = nowValue;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
- }
- }
- }
-
-
- // Focus a actor
- if(flagFind == true){
- kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
- lastFocusActor = nextFocusActor;
- }
-
- return flagFind;
-}
-
void CustomCluster::TabKeyClicked(bool clickedShift)
{
Actor nextFocusActor;
int prevX, prevY;
bool flagCheckLine = false;
- bool flagFind;
+ bool flagFind = false;
+
+ bool isIndicator = false;
if(mIsAllPageMode == true){
return;
}
- if((focusGroup && focusGroup.GetName() != "CustomCluster") || !focusGroup)
+ if(m_cHomeScreenPageIndicator->IsContain(currentFocusedActor)) {
+ if( m_cHomeScreenPageIndicator->TabKeyClicked(clickedShift) ) {
+ return ;
+ }
+
+ isIndicator = true;
+ }
+
+ if((focusGroup && focusGroup.GetName() != "CustomCluster") || !focusGroup || isIndicator)
{
- // Move to last selected Actor if now page is the same page
- if(lastFocusActor)
+ // Move to last selected Actor if now page is the same page
+ if(mLastFocusActor)
{
- TEST_DBG("[%s]", lastFocusActor.GetName().c_str());
- if(!lastFocusActor.GetName().find("Page"))
+ TEST_DBG("[%s]", mLastFocusActor.GetName().c_str());
+ if(!mLastFocusActor.GetName().find("Page"))
{
- kbdFocusManager.SetCurrentFocusActor(lastFocusActor);
- return;
+ kbdFocusManager.SetCurrentFocusActor(mLastFocusActor);
+ return;
}
else
{
if(mKeyboardFocusCurrentPage <= 0)
mKeyboardFocusCurrentPage = 1;
- lastFocusActor = mPages[mKeyboardFocusCurrentPage-1];
- kbdFocusManager.SetCurrentFocusActor(lastFocusActor);
+ mLastFocusActor = mPages[mKeyboardFocusCurrentPage-1];
+ kbdFocusManager.SetCurrentFocusActor(mLastFocusActor);
return;
}
else
{
- currentFocusedBox = ClusterHome3D::CustomBox::DownCast(lastFocusActor);
- if(currentFocusedBox.GetBoxPositionInfo().z == GetFocusedPage())
+ currentFocusedBox = ClusterHome3D::CustomBox::DownCast(mLastFocusActor);
+ if(currentFocusedBox.GetBoxPositionInfo().z == GetFocusedPage())
{
- nextFocusActor = lastFocusActor;
- flagFind = true;
- kbdFocusManager.SetCurrentFocusActor(lastFocusActor);
- }
+ nextFocusActor = mLastFocusActor;
+ flagFind = true;
+ kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+ }
}
}
}
- // Move to First Actor
- prevX = CUSTOM_GRID_MAX_ROW+1;
- prevY = CUSTOM_GRID_MAX_COL+1;
+ // Move to First Actor
+ prevX = CUSTOM_GRID_MAX_ROW+1;
+ prevY = CUSTOM_GRID_MAX_COL+1;
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
{
- if((*boxIter).GetBoxPositionInfo().z == GetFocusedPage())
+ if((*boxIter).GetBoxPositionInfo().z == GetFocusedPage())
{
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
{
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- if(prevX > nowX || (prevX == nowX && prevY >= nowY))
+ if(prevX > nowX || (prevX == nowX && prevY >= nowY))
{
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
}
- }
+ }
}
if(!flagFind)
}
}
// Control - Basic Box
- else// if(focusGroup && focusGroup.GetName() == "CustomCluster")
+ else// if(focusGroup && focusGroup.GetName() == "CustomCluster")
{
if(!currentFocusedActor.GetName().find("Page"))
{
HOME_DBG("currentFocusedActor:[%s]", currentFocusedActor.GetName().c_str());
- nextFocusActor = currentFocusedActor;
+ if(clickedShift) {
+ nextFocusActor = m_cHomeScreenPageIndicator->GetLastActor();
+ } else {
+ nextFocusActor = m_cHomeScreenPageIndicator->GetFirstActor();
+ }
kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+
+ return ;
}
- currentFocusedBox = ClusterHome3D::CustomBox::DownCast(currentFocusedActor);
+ currentFocusedBox = ClusterHome3D::CustomBox::DownCast(currentFocusedActor);
- // currentFocusedBox position
- currentFocusedBoxX = (int)currentFocusedBox.GetBoxPositionInfo().x;
- currentFocusedBoxY = (int)currentFocusedBox.GetBoxPositionInfo().y;
+ // currentFocusedBox position
+ currentFocusedBoxX = (int)currentFocusedBox.GetBoxPositionInfo().x;
+ currentFocusedBoxY = (int)currentFocusedBox.GetBoxPositionInfo().y;
- // currentFocusedBox Size
- currentFocusedBoxSize = currentFocusedBox.GetSizeType();
- currentFocusedBoxWidth = getCustomBoxSizeWidth(currentFocusedBoxSize);
- currentFocusedBoxHeight = getCustomBoxSizeHeight(currentFocusedBoxSize);
+ // currentFocusedBox Size
+ currentFocusedBoxSize = currentFocusedBox.GetSizeType();
+ currentFocusedBoxWidth = getCustomBoxSizeWidth(currentFocusedBoxSize);
+ currentFocusedBoxHeight = getCustomBoxSizeHeight(currentFocusedBoxSize);
//Tab + Shift
if(clickedShift)
{
- prevX = CUSTOM_GRID_MAX_ROW+1;
- prevY = 0;
- flagFind = false;
+ prevX = CUSTOM_GRID_MAX_ROW+1;
+ prevY = 0;
+ flagFind = false;
- // 1st) Search a same line.
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
+ // 1st) Search a same line.
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
{
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
-
- if(nowY < currentFocusedBoxY){
- flagCheckLine= getCheckSameLine(currentFocusedBoxX,currentFocusedBoxX +currentFocusedBoxHeight,nowX,nowX+nowHeight);
-
- if(flagCheckLine == true){
- if(prevY < nowY || (prevY == nowY && prevX >= nowX)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
- }
- }
- }
- }
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
+
+ if(nowY < currentFocusedBoxY) {
+ flagCheckLine= getCheckSameLine(currentFocusedBoxX,currentFocusedBoxX +currentFocusedBoxHeight,nowX,nowX+nowHeight);
+ if(flagCheckLine == true){
+ if(prevY < nowY || (prevY == nowY && prevX >= nowX)) {
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
+ }
+ }
+ }
+ }
- // 2nd) Search a additional line.
- if(flagFind == false){
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
+ // 2nd) Search a additional line.
+ if(flagFind == false) {
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
{
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
{
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
-
- if(nowY < currentFocusedBoxY){
- if(prevY < nowY || (prevY == nowY && prevX >= nowX)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
+
+ if(nowY < currentFocusedBoxY){
+ if(prevY < nowY || (prevY == nowY && prevX >= nowX)) {
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
}
- }
- }
- }
+ }
+ }
+ }
- if(flagFind == false){
- prevX = 0;
- prevY = CUSTOM_GRID_MAX_COL+1;
- flagFind = false;
+ if(flagFind == false) {
+ prevX = 0;
+ prevY = CUSTOM_GRID_MAX_COL+1;
+ flagFind = false;
- // 1st) Search a same line.
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
+ // 1st) Search a same line.
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
{
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
-
- if(nowX < currentFocusedBoxX){
- flagCheckLine = getCheckSameLine(currentFocusedBoxY,currentFocusedBoxY +currentFocusedBoxWidth,nowY,nowY+nowWidth);
-
- if(flagCheckLine == true){
- if(prevX < nowX || (prevX == nowX && prevY >= nowY)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
- }
- }
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
- }
- }
+ if(nowX < currentFocusedBoxX) {
+ flagCheckLine = getCheckSameLine(currentFocusedBoxY,currentFocusedBoxY +currentFocusedBoxWidth,nowY,nowY+nowWidth);
+ if(flagCheckLine == true) {
+ if(prevX < nowX || (prevX == nowX && prevY >= nowY)){
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
+ }
+ }
+ }
+ }
- // 2nd) Search a additional line.
- if(flagFind == false){
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
-
- if(nowX < currentFocusedBoxX){
- if(prevX < nowX || (prevX == nowX && prevY >= nowY)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
+ // 2nd) Search a additional line.
+ if(flagFind == false) {
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter) {
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
+
+ if(nowX < currentFocusedBoxX) {
+ if(prevX < nowX || (prevX == nowX && prevY >= nowY)) {
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
}
- }
+ }
}
- }
+ }
- // Block to move to a different area
- if(flagFind == false){
- nextFocusActor = currentFocusedActor;
- }
- }
+ if(flagFind == false){
+ nextFocusActor = m_cHomeScreenPageIndicator->GetLastActor();
+ kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+ return ;
+ }
+ }
}
//Tab
else
{
- prevX = CUSTOM_GRID_MAX_ROW+1;
- prevY = CUSTOM_GRID_MAX_COL+1;
- flagFind = false;
+ prevX = CUSTOM_GRID_MAX_ROW+1;
+ prevY = CUSTOM_GRID_MAX_COL+1;
+ flagFind = false;
+ // 1st) Search a same line.
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter) {
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
- // 1st) Search a same line.
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
-
- if(nowY >= currentFocusedBoxY+currentFocusedBoxWidth){
- flagCheckLine = getCheckSameLine(currentFocusedBoxX,currentFocusedBoxX +currentFocusedBoxHeight,nowX,nowX+nowHeight);
-
- if(flagCheckLine == true){
- if(prevY > nowY || (prevY == nowY && prevX >= nowX)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
- }
+ if(nowY >= currentFocusedBoxY+currentFocusedBoxWidth) {
+ flagCheckLine = getCheckSameLine(currentFocusedBoxX,currentFocusedBoxX +currentFocusedBoxHeight,nowX,nowX+nowHeight);
+
+ if(flagCheckLine == true){
+ if(prevY > nowY || (prevY == nowY && prevX >= nowX)){
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
+ }
}
- }
+ }
}
+ // 2nd) Search a additional line.
+ if(flagFind == false){
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter) {
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
- // 2nd) Search a additional line.
- if(flagFind == false){
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowHeight= getCustomBoxSizeHeight((*boxIter).GetSizeType());
-
- if(nowY >= currentFocusedBoxY+currentFocusedBoxWidth){
- if(prevY > nowY || (prevY == nowY && prevX >= nowX)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
+ if(nowY >= currentFocusedBoxY+currentFocusedBoxWidth) {
+ if(prevY > nowY || (prevY == nowY && prevX >= nowX)){
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
}
- }
+ }
}
- }
+ }
- if(flagFind == false){
- prevX = CUSTOM_GRID_MAX_ROW+1;
- prevY = CUSTOM_GRID_MAX_COL+1;
- flagFind = false;
+ if(flagFind == false){
+ prevX = CUSTOM_GRID_MAX_ROW+1;
+ prevY = CUSTOM_GRID_MAX_COL+1;
+ flagFind = false;
- // 1st) Search a same line.
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
-
- if(nowX >= currentFocusedBoxX+currentFocusedBoxHeight){
-
- flagCheckLine = getCheckSameLine(currentFocusedBoxY,currentFocusedBoxY +currentFocusedBoxWidth,nowY,nowY+nowWidth);
-
- if(flagCheckLine == true){
- if(prevX > nowX || (prevX == nowX && prevY >= nowY)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
- }
+ // 1st) Search a same line.
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter) {
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
+
+ if(nowX >= currentFocusedBoxX+currentFocusedBoxHeight){
+ flagCheckLine = getCheckSameLine(currentFocusedBoxY,currentFocusedBoxY +currentFocusedBoxWidth,nowY,nowY+nowWidth);
+
+ if(flagCheckLine == true){
+ if(prevX > nowX || (prevX == nowX && prevY >= nowY)){
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
+ }
}
- }
+ }
}
- // 2nd) Search a additional line.
- if(flagFind == false){
- for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter)
- {
- if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z){
- if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f)
- {
- nowX = (int)(*boxIter).GetBoxPositionInfo().x;
- nowY = (int)(*boxIter).GetBoxPositionInfo().y;
- nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
-
- if(nowX >= currentFocusedBoxX+currentFocusedBoxHeight){
- if(prevX > nowX || (prevX == nowX && prevY >= nowY)){
- prevY = nowY;
- prevX = nowX;
- nextFocusActor = (*boxIter);
- flagFind = true;
- }
- }
+ // 2nd) Search a additional line.
+ if(flagFind == false){
+ for (boxIter = mBoxes.begin(); boxIter != mBoxes.end(); ++boxIter) {
+ if((*boxIter).GetBoxPositionInfo().z == currentFocusedBox.GetBoxPositionInfo().z) {
+ if((*boxIter).IsVisible() && (*boxIter).GetCurrentOpacity() > 0.0f) {
+ nowX = (int)(*boxIter).GetBoxPositionInfo().x;
+ nowY = (int)(*boxIter).GetBoxPositionInfo().y;
+ nowWidth = getCustomBoxSizeWidth((*boxIter).GetSizeType());
+
+ if(nowX >= currentFocusedBoxX+currentFocusedBoxHeight) {
+ if(prevX > nowX || (prevX == nowX && prevY >= nowY)) {
+ prevY = nowY;
+ prevX = nowX;
+ nextFocusActor = (*boxIter);
+ flagFind = true;
+ }
+ }
}
- }
+ }
}
- }
- }
+ }
+ }
+
+ if(flagFind == false){
+ nextFocusActor = m_cHomeScreenPageIndicator->GetFirstActor();
+ kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+ return ;
+ }
}
- }
+ }
- // Save last FocusActor
+ // Save last FocusActor
if(nextFocusActor){
- lastFocusActor = nextFocusActor;
+ mLastFocusActor = nextFocusActor;
}
kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
return flagCheck;
}
-void CustomCluster::OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+void CustomCluster::OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
mIsKeyboardOn = true;
int focusedPage = GetFocusedPage();
int totalPage = GetPageCount();
// while keyboard mode, move page
- if (direction == Dali::Toolkit::Control::Right)
+ if (direction == Dali::Toolkit::Control::KeyboardFocus::RIGHT)
{
if (focusedPage == totalPage)
{
ScrollTo(GetFocusedPage() - 1);
}
- else if (direction == Dali::Toolkit::Control::Left)
+ else if (direction == Dali::Toolkit::Control::KeyboardFocus::LEFT)
{
if (focusedPage == 1)
{
-Actor CustomCluster::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CustomCluster::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
VIEWER_ERR("Do not find the focus group");
if(m_cHomeScreenPageIndicator->IsContain(currentFocusedActor)) {
- if(direction != Dali::Toolkit::Control::Up) {
+ if(direction != Dali::Toolkit::Control::KeyboardFocus::UP) {
return m_cHomeScreenPageIndicator->QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
if((focusGroup && focusGroup.GetName() != "CustomCluster") || !focusGroup || isIndicator) {
switch(direction)
{
- case Dali::Toolkit::Control::Up :
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
{
TEST_DBG("Move a up or down box");
// Move to last selected Actor if now page is the same page
- if(lastFocusActor)
+ if(mLastFocusActor)
{
- TEST_DBG("[%s]", lastFocusActor.GetName().c_str());
- if(lastFocusActor.GetName().find("Page"))
+ TEST_DBG("[%s]", mLastFocusActor.GetName().c_str());
+ if(mLastFocusActor.GetName().find("Page"))
{
if(!focusGroup)
{
if(mKeyboardFocusCurrentPage <= 0)
mKeyboardFocusCurrentPage = 1;
- lastFocusActor = mPages[mKeyboardFocusCurrentPage-1];
- return lastFocusActor;
+ mLastFocusActor = mPages[mKeyboardFocusCurrentPage-1];
+ return mLastFocusActor;
}
else
{
- currentFocusedBox = ClusterHome3D::CustomBox::DownCast(lastFocusActor);
+ currentFocusedBox = ClusterHome3D::CustomBox::DownCast(mLastFocusActor);
if(currentFocusedBox.GetBoxPositionInfo().z == GetFocusedPage())
{
- nextFocusActor = lastFocusActor;
+ nextFocusActor = mLastFocusActor;
flagFind = true;
- return lastFocusActor;
+ return mLastFocusActor;
}
}
}
{
HOME_DBG("currentFocusedActor:[%s]", currentFocusedActor.GetName().c_str());
nextFocusActor = currentFocusedActor;
- if( direction == Dali::Toolkit::Control::Right || direction == Dali::Toolkit::Control::Left) {
+ if( direction == Dali::Toolkit::Control::KeyboardFocus::RIGHT || direction == Dali::Toolkit::Control::KeyboardFocus::LEFT) {
OnKeyboardFocusOvershot(direction);
- } else if( direction == Dali::Toolkit::Control::Down ) {
+ } else if( direction == Dali::Toolkit::Control::KeyboardFocus::DOWN ) {
return m_cHomeScreenPageIndicator->GetFirstActor();
}
switch(direction){
// Right direction
- case Dali::Toolkit::Control::Right :
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
prevX = CUSTOM_GRID_MAX_ROW+1;
prevY = CUSTOM_GRID_MAX_COL+1;
flagFind = false;
break;
// Left direction
- case Dali::Toolkit::Control::Left :
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
prevX = CUSTOM_GRID_MAX_ROW+1;
prevY = 0;
flagFind = false;
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
prevX = 0;
prevY = CUSTOM_GRID_MAX_COL+1;
flagFind = false;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
prevX = CUSTOM_GRID_MAX_ROW+1;
prevY = CUSTOM_GRID_MAX_COL+1;
flagFind = false;
}
if(flagFind == false) {
- VIEWER_DBG("ttt");
return m_cHomeScreenPageIndicator->GetFirstActor();
}
// Save last FocusActor
if(nextFocusActor){
- lastFocusActor = nextFocusActor;
+ mLastFocusActor = nextFocusActor;
}
return nextFocusActor;
}
-Actor CustomCluster::GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
+Actor CustomCluster::GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled)
{
VIEWER_ERR("==========================\n");
* Keyboard focus
* @return next focusable actor if view's child should be focused
*/
- virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
/**
* A reference counted object may only be deleted by calling Unreference()
/**
* @copydoc Toolkit::Control::GetNextKeyboardFocusableActor()
*/
- virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+ virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled);
private:
// screen reader
void OnFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor);
- void OnFocusOvershot(Actor currentFocusedActor, Toolkit::FocusManager::FocusOvershotDirection direction);
+ void OnFocusOvershot(Actor currentFocusedActor, Toolkit::AccessibilityFocusManager::FocusOvershotDirection direction);
void OnFocusedActorActivated(Actor activatedActor);
// Add Page button press long
void blockBoxEvent();
int GetAllPageCount();
- // Click a tabkey
- bool TabKeyClicked(bool,bool);
void TabKeyClicked(bool clickedShift);
- void OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ void OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocus::Direction direction);
bool IsScrolling(void) { return mIsScrolling; }
* TTS
*/
ClusterHome3D::CustomBox mLastFocusedBox;
- Toolkit::FocusManager::FocusOvershotDirection mLastOvershotDirection;
+ Toolkit::AccessibilityFocusManager::FocusOvershotDirection mLastOvershotDirection;
bool mIsNeedToFocus;
// boost timer
unsigned int mKeyboardFocusCurrentPage;
// LastFocusActor
- Actor lastFocusActor;
+ Actor mLastFocusActor;
bool m_bMainScrolling;
}
}
-void CustomClusterPage::OnActivated()
+bool CustomClusterPage::OnAccessibilityActivated()
{
Actor actor = Self();
TapGesture tap;
OnTap(actor, tap);
+ return true;
}
bool CustomClusterPage::OnAccessibilityTouch(const TouchEvent& event)
void CustomClusterPage::UpdateScreenReader()
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
Actor self = Self();
int nOrder = BASE_FOCUS_ORDER_PAGE + (int) mLayoutPosition * 10;
snprintf(buf, sizeof(buf), _NOT_LOCALIZED("Page %d"), (int) mLayoutPosition);
focusManager.SetFocusOrder(self, nOrder++);
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_LABEL, buf);
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, buf);
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
if (mDeleteButton)
{
focusManager.SetFocusOrder(mDeleteButton, nOrder++);
- focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_BODY_DELETE_OPT_TTS"));
- focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_BODY_DELETE_OPT_TTS"));
+ focusManager.SetAccessibilityAttribute(mDeleteButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
}
virtual void OnControlChildRemove(Actor& child);
// for screen reader
- virtual void OnActivated();
+ virtual bool OnAccessibilityActivated();
virtual bool OnAccessibilityTouch(const TouchEvent& event);
private:
return GetImpl( *this ).GetAllPageCount();
}
-bool CustomCluster::TabKeyClicked(bool clickedShift,bool flagInit)
-{
- return GetImpl(*this).TabKeyClicked(clickedShift,flagInit);
-}
void CustomCluster::TabKeyClicked(bool clickedShift)
{
GetImpl(*this).TabKeyClicked(clickedShift);
}
-void CustomCluster::OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction){
+void CustomCluster::OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocus::Direction direction){
GetImpl(*this).OnKeyboardFocusOvershot(direction);
}
void blockBoxEvent();
int GetAllPageCount();
- // Click a tabkey
- bool TabKeyClicked(bool, bool);
void TabKeyClicked(bool clickedShift);
- void OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ void OnKeyboardFocusOvershot(Dali::Toolkit::Control::KeyboardFocus::Direction direction);
bool IsScrolling(void);
/**
void SetEventHandler(void *handler);
void SetWidgetType(int type);
- void SetHasProgressiveDisclosure(int hasPD);
void SetBoxIsAddedToViewer(bool isAdded);
// Set box is widget data not icon that internally has
void SetBoxIsWidgetData(bool isWidgetData);
/* manage box buffer */
void *AcquireBoxBuffer(void);
void ReleaseBoxBuffer(void *buffer);
- /* manage pd buffer */
- void *AcquireProgressiveDisclosureBuffer(void);
- void ReleaseProgressiveDisclosureBuffer(void *buffer);
private:
/* Get tail buffer data from list */
int nOrder = BASE_FOCUS_ORDER_DELETE_POPUP;
bool bFocusSet = false;
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.SetWrapMode(true);
if (m_aPopupTitleBg)
{
focusManager.SetFocusOrder(m_aPopupTitleBg, nOrder++);
- focusManager.SetAccessibilityAttribute(m_aPopupTitleBg, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_strTitleText);
- focusManager.SetAccessibilityAttribute(m_aPopupTitleBg, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_ST_BODY_POP_UP_HEADER_T_TALKBACK_T_TALKBACK"));
+ focusManager.SetAccessibilityAttribute(m_aPopupTitleBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_strTitleText);
+ focusManager.SetAccessibilityAttribute(m_aPopupTitleBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_ST_BODY_POP_UP_HEADER_T_TALKBACK_T_TALKBACK"));
if (m_eCenterPopupType == CENTER_POPUP_TYPE_LIST)
{
char sBuf[1024] = { 0, };
snprintf(sBuf, sizeof(sBuf), _("IDS_CAM_BODY_SHOWING_PD_ITEMS_T_TTS"), m_ListItems.size());
- focusManager.SetAccessibilityAttribute(m_aPopupTitleBg, Toolkit::FocusManager::ACCESSIBILITY_HINT, sBuf);
+ focusManager.SetAccessibilityAttribute(m_aPopupTitleBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, sBuf);
}
focusManager.SetCurrentFocusActor(m_aPopupTitleBg);
if (m_eCenterPopupType == CENTER_POPUP_TYPE_TEXT)
{
focusManager.SetFocusOrder(m_aPopupContentText, nOrder++);
- focusManager.SetAccessibilityAttribute(m_aPopupContentText, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_strContentText);
- focusManager.SetAccessibilityAttribute(m_aPopupContentText, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_ST_BODY_TEXT_IN_BODY_OF_POP_UP_T_TALKBACK"));
+ focusManager.SetAccessibilityAttribute(m_aPopupContentText, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_strContentText);
+ focusManager.SetAccessibilityAttribute(m_aPopupContentText, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_ST_BODY_TEXT_IN_BODY_OF_POP_UP_T_TALKBACK"));
if (!bFocusSet)
{
if (pItem->m_aPushButton)
{
focusManager.SetFocusOrder(pItem->m_aPushButton, nOrder++);
- focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::FocusManager::ACCESSIBILITY_LABEL, pItem->m_strLabel);
+ focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, pItem->m_strLabel);
if (pItem->m_aActivateNormalImage && pItem->m_aActivatePressImage)
{
- focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_TPLATFORM_BODY_RADIO_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_TPLATFORM_BODY_RADIO_BUTTON_T_TTS"));
if (pItem->m_bActivated)
{
- focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_TPLATFORM_BODY_SELECTED_T_TTS"));
+ focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_TPLATFORM_BODY_SELECTED_T_TTS"));
}
else
{
- focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_TPLATFORM_BODY_NOT_SELECTED_T_TTS"));
+ focusManager.SetAccessibilityAttribute(pItem->m_aPushButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_TPLATFORM_BODY_NOT_SELECTED_T_TTS"));
}
}
if (m_aPopupButtonLeft)
{
focusManager.SetFocusOrder(m_aPopupButtonLeft, nOrder++);
- focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_PopupButtonTextLeftImg.GetText());
- focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_PopupButtonTextLeftImg.GetText());
+ focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
if (m_aPopupButtonCenter)
{
focusManager.SetFocusOrder(m_aPopupButtonCenter, nOrder++);
- focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_PopupButtonTextCenterImg.GetText());
- focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_PopupButtonTextCenterImg.GetText());
+ focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
if (m_aPopupButtonRight)
{
focusManager.SetFocusOrder(m_aPopupButtonRight, nOrder++);
- focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_PopupButtonTextRightImg.GetText());
- focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_PopupButtonTextRightImg.GetText());
+ focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
}
}
}
-Actor CHomeScreenCenterPopup::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CHomeScreenCenterPopup::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
switch(direction)
{
// Right direction
- case Dali::Toolkit::Control::Right :
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
if (currentFocusedActor == m_aPopupButtonLeft)
{
if(m_aPopupButtonCenter)
break;
// Left direction
- case Dali::Toolkit::Control::Left :
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
if (currentFocusedActor == m_aPopupButtonLeft)
{
if(m_aPopupButtonRight)
break;
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
if(m_eCenterPopupType == CENTER_POPUP_TYPE_LIST)
{
if( (currentFocusedActor == m_aPopupButtonLeft)
break;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
if(m_eCenterPopupType == CENTER_POPUP_TYPE_LIST)
{
if( (currentFocusedActor == m_aPopupButtonLeft)
// keyboard
Actor GetFocusItemListbyId(int nItemListId);
void SetFocusInit();
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
private:
float CHomeScreenConst::mWidgetSizeUnitWidth[CHomeScreenConst::RESOLUTION_BASE_MAX] = {0.0f,0.0f,116.0f,130.0f};
-float CHomeScreenConst::mWidgetSizeUnitHeight[CHomeScreenConst::RESOLUTION_BASE_MAX] = {0.0f,0.0f,125.0f,150.0f};
-float CHomeScreenConst::mWidgetPosGapW[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,4.0f,4.0f};
-float CHomeScreenConst::mWidgetPosGapH[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,4.0f,4.0f};
-
+float CHomeScreenConst::mWidgetSizeUnitHeight[CHomeScreenConst::RESOLUTION_BASE_MAX] = {0.0f,0.0f,116.0f,130.0f};
+float CHomeScreenConst::mWidgetPosGapW[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,1.0f,2.0f};
+float CHomeScreenConst::mWidgetPosGapH[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,1.0f,2.0f};
float CHomeScreenConst::mClusterAllPageH[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,20.0f,20.0f};
float CHomeScreenConst::mClusterHomeYMax[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,572.0f,572.0f};
float CHomeScreenConst::mClusterHomePageWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,480.0f,540.0f};
-
-float CHomeScreenConst::mClusterHomePageHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,508.0f,612.0f};
-float CHomeScreenConst::mClusterHomeViewHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,508.0f,612.0f};
-
-float CHomeScreenConst::mClusterHomeWidgetAreaHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,520.0f,612.0f};
-
+float CHomeScreenConst::mClusterHomePageHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,470.0f,564.0f};
+float CHomeScreenConst::mClusterHomeViewHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,470.0f,564.0f};
+float CHomeScreenConst::mClusterHomeWidgetAreaHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,470.0f,564.0f};
float CHomeScreenConst::mClusterHomePageIndicatorArea[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,62.0f,62.0f};
float CHomeScreenConst::mClusterHomePageIndicatorGapY[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,0.0f,0.0f};
float CHomeScreenConst::mClusterHomeWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,480.0f,540.0f};
float CHomeScreenConst::mCCAllPageSideXGap[CHomeScreenConst::RESOLUTION_BASE_MAX]={0.0f,0.0f,26.0f,29.0f};
float CHomeScreenConst::mCCDeleteButtonHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,44.0f,48.0f};
-
-float CHomeScreenConst::mCCEditPageWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,432.0f,486.0f};
-float CHomeScreenConst::mCCEditPageHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,459.0f,551.0f};
-
-float CHomeScreenConst::mCCGridEditX[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,24.0f,27.0f};
-
-float CHomeScreenConst::mCCAllPageWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,214.0f,240.0f};
-float CHomeScreenConst::mCCAllPageHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,233.0f,278.0f};
-
-float CHomeScreenConst::mCCAllPageY[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,9.0f,6.0f};
+float CHomeScreenConst::mCCEditPageWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,422.0f,472.0f};
+float CHomeScreenConst::mCCEditPageHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,422.0f,472.0f};
+float CHomeScreenConst::mCCGridEditX[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,29.0f,29.0f};
+float CHomeScreenConst::mCCAllPageWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,225.0f,252.0f};
+float CHomeScreenConst::mCCAllPageHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,225.0f,252.0f};
+float CHomeScreenConst::mCCAllPageY[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,5.0f,5.0f};
float CHomeScreenConst::mCCAllPageButtonWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,82.0f,82.0f};
float CHomeScreenConst::mCCAllPageButtonHeight[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,82.0f,82.0f};
float CHomeScreenConst::mCCPageShadowWidth[CHomeScreenConst::RESOLUTION_BASE_MAX]= {0.0f,0.0f,16.6f,16.6f};
return m_aLeftButton;
}
-Actor CHomeScreenPageIndicator::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CHomeScreenPageIndicator::GetLastActor()
+{
+ return m_aRightButton;
+}
+
+Actor CHomeScreenPageIndicator::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
- if(currentFocusedActor == m_aLeftButton && direction == Dali::Toolkit::Control::Right) {
+ if(currentFocusedActor == m_aLeftButton && direction == Dali::Toolkit::Control::KeyboardFocus::RIGHT) {
nextFocusActor = m_aRightButton;
- } else if(currentFocusedActor == m_aRightButton && direction == Dali::Toolkit::Control::Left) {
+ } else if(currentFocusedActor == m_aRightButton && direction == Dali::Toolkit::Control::KeyboardFocus::LEFT) {
nextFocusActor = m_aLeftButton;
}
return nextFocusActor;
}
+bool CHomeScreenPageIndicator::TabKeyClicked(bool clickedShift)
+{
+ Actor nextFocusActor;
+ Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
+ Actor currentFocusedActor = kbdFocusManager.GetCurrentFocusActor();
+
+ if(clickedShift) {
+ if( currentFocusedActor == m_aLeftButton ) {
+ return false;
+ }
+ nextFocusActor = m_aLeftButton;
+ } else {
+ if( currentFocusedActor == m_aRightButton ) {
+ return false;
+ }
+ nextFocusActor = m_aRightButton;
+ }
+ kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+
+ return true;
+}
+
bool IsContain(Actor currentFocusedActor);
Actor GetFirstActor();
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor GetLastActor();
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ bool TabKeyClicked(bool clickedShift);
private:
/*
* Key focus
*/
- virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction) { return Dali::Actor(); };
+ virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction) { return Dali::Actor(); };
virtual void TabKeyClicked(bool clickedShift) { return; };
private:
{
int order = BASE_FOCUS_ORDER_OPTION_POPUP;
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.SetWrapMode(true);
// container
focusManager.SetFocusOrder(mContainer, order++);
- focusManager.SetAccessibilityAttribute(mContainer, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_SCR_OPT_MENU_POP_UP_TTS"));
+ focusManager.SetAccessibilityAttribute(mContainer, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_SCR_OPT_MENU_POP_UP_TTS"));
char sBuf[1024] = { 0, };
snprintf(sBuf, sizeof(sBuf), _("IDS_CAM_BODY_SHOWING_PD_ITEMS_T_TTS"), mButtonCount);
- focusManager.SetAccessibilityAttribute(mContainer, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, sBuf);
- focusManager.SetAccessibilityAttribute(mContainer, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_ST_BODY_DOUBLE_TAP_TO_CLOSE_THE_MENU_T_TTS"));
+ focusManager.SetAccessibilityAttribute(mContainer, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, sBuf);
+ focusManager.SetAccessibilityAttribute(mContainer, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_ST_BODY_DOUBLE_TAP_TO_CLOSE_THE_MENU_T_TTS"));
focusManager.SetCurrentFocusActor(mContainer);
if (actor)
{
focusManager.SetFocusOrder(actor, order++);
- focusManager.SetAccessibilityAttribute(actor, Toolkit::FocusManager::ACCESSIBILITY_LABEL, mTextMap[id]);
+ focusManager.SetAccessibilityAttribute(actor, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, mTextMap[id]);
}
}
}
-Actor MenuPopup::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor MenuPopup::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
int moveKeyboardBoxID = 0;
switch(direction)
{
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
TEST_DBG("Move a up box");
break;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
TEST_DBG("Move a down box");
break;
void UpdateScreenReader(void);
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
/**
GetImpl(*this).UpdateScreenReader();
}
-Actor MenuPopup::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor MenuPopup::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
void UpdateScreenReader(void);
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
/**
}
}
-Actor CHomeScreen::OnKeyboardPreFocusChange(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CHomeScreen::OnKeyboardPreFocusChange(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
void OnDragAndDropDropped(Dali::DragAndDropDetector detector);
// Keyboard focus
- Actor OnKeyboardPreFocusChange(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor OnKeyboardPreFocusChange(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void OnKeyboardFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor);
void OnKeyboardFocusGroupChanged(Actor currentFocusedActor, bool forward);
void CMainMenuAppsView::UpdateScreenReader()
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
ClusterHome3D::Accessibility *cHomeAccessibility = ClusterHome3D::Accessibility::Get();
int nFocusGroup = cHomeAccessibility->GetCurrentGroup();
snprintf(buf, sizeof(buf), _("IDS_HS_BODY_PAGE_P1SD_OF_P2SD"), mAppsViewFocusedPage, mAppsViewPageCount);
focusManager.SetFocusOrder(m_FocusedPage, BASE_FOCUS_ORDER_APPS_VIEW_PAGE);
- focusManager.SetAccessibilityAttribute(m_FocusedPage, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_ST_HEADER_APPLICATIONS"));
- focusManager.SetAccessibilityAttribute(m_FocusedPage, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, buf);
- focusManager.SetAccessibilityAttribute(m_FocusedPage, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_STORYALBUM_BODY_SWIPE_WITH_TWO_FINGERS_TO_VIEW_NEXT_PAGE_TTS"));
+ focusManager.SetAccessibilityAttribute(m_FocusedPage, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_ST_HEADER_APPLICATIONS"));
+ focusManager.SetAccessibilityAttribute(m_FocusedPage, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, buf);
+ focusManager.SetAccessibilityAttribute(m_FocusedPage, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_STORYALBUM_BODY_SWIPE_WITH_TWO_FINGERS_TO_VIEW_NEXT_PAGE_TTS"));
m_FocusedPage.UpdateScreenReader();
if (aPageIndiActor)
{
focusManager.SetFocusOrder(aPageIndiActor, BASE_FOCUS_ORDER_APPS_VIEW_PAGE_INDICATOR);
- focusManager.SetAccessibilityAttribute(aPageIndiActor, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, buf);
+ focusManager.SetAccessibilityAttribute(aPageIndiActor, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, buf);
}
}
}
}
-Actor CMainMenuAppsView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuAppsView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
}
if(m_cHomeScreenPageIndicator->IsContain(currentFocusedActor)) {
- if(direction == Dali::Toolkit::Control::Up) {
+ if(direction == Dali::Toolkit::Control::KeyboardFocus::UP) {
nextFocusActor = focusedPage.GetLastActor();
} else {
nextFocusActor = m_cHomeScreenPageIndicator->QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
} else if(currentFocusedActor == m_aTitleLeftButton || currentFocusedActor == m_aTitleRightButton) {
- if(direction == Dali::Toolkit::Control::Down) {
+ if(direction == Dali::Toolkit::Control::KeyboardFocus::DOWN) {
nextFocusActor = focusedPage.GetFirstActor();
- } else if(direction == Dali::Toolkit::Control::Left) {
+ } else if(direction == Dali::Toolkit::Control::KeyboardFocus::LEFT) {
nextFocusActor = m_aTitleLeftButton;
- } else if(direction == Dali::Toolkit::Control::Right) {
+ } else if(direction == Dali::Toolkit::Control::KeyboardFocus::RIGHT) {
nextFocusActor = m_aTitleRightButton;
} else {
nextFocusActor = currentFocusedActor;
void CMainMenuAppsView::TabKeyClicked(bool clickedShift)
{
+ Actor nextFocusActor;
+ Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
+ Actor currentFocusedActor = kbdFocusManager.GetCurrentFocusActor();
+
if(m_cShowingFolderBox)
{
m_cShowingFolderBox.TabKeyClicked(clickedShift);
}
ClusterHome3D::CMainMenuPage focusedPage = mAppsPages[mAppsViewFocusedPage-1];
- if(focusedPage)
- {
- focusedPage.TabKeyClicked(clickedShift);
+ if(!focusedPage) {
+ HOME_ERR("focusedPage is not found");
+ return ;
+ }
+
+ if(m_cHomeScreenPageIndicator->IsContain(currentFocusedActor)) {
+ if( m_cHomeScreenPageIndicator->TabKeyClicked(clickedShift) ) {
+ return ;
+ }
+
+ if(clickedShift) {
+ nextFocusActor = focusedPage.GetLastActor();
+ } else {
+ nextFocusActor = focusedPage.GetFirstActor();
+ }
+ } else if(currentFocusedActor == m_aTitleLeftButton || currentFocusedActor == m_aTitleRightButton) {
+ if(clickedShift) {
+ if(currentFocusedActor == m_aTitleLeftButton) {
+ nextFocusActor = focusedPage.GetLastActor();
+ } else {
+ nextFocusActor = m_aTitleLeftButton;
+ }
+ } else {
+ if(currentFocusedActor == m_aTitleRightButton) {
+ nextFocusActor = focusedPage.GetFirstActor();
+ } else {
+ nextFocusActor = m_aTitleRightButton;
+ }
+ }
+ } else if(focusedPage.IsContain(currentFocusedActor)) {
+ if(focusedPage.TabKeyClicked(clickedShift)) {
+ return ;
+ }
+
+ if(clickedShift) {
+ if(m_eAppsViewType == APPS_VIEW_ADD_APPS_TO_FOLDER) {
+ nextFocusActor = m_aTitleRightButton;
+ } else {
+ nextFocusActor = m_cHomeScreenPageIndicator->GetLastActor();
+ }
+ } else {
+ if(m_eAppsViewType == APPS_VIEW_ADD_APPS_TO_FOLDER) {
+ nextFocusActor = m_aTitleLeftButton;
+ } else {
+ nextFocusActor = m_cHomeScreenPageIndicator->GetFirstActor();
+ }
+ }
}
else
{
- HOME_ERR("focusedPage is not found");
+ nextFocusActor = focusedPage.GetFirstActor();
}
+
+ kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
}
bool CMainMenuAppsView::OnBoxPicked(Vector3 boxPos)
void SetViewTouchSensitive(bool bTouchSensitive);
void OnChangedViewType(HomeScreenViewType eViewType);
// Keyboard focus
- virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
virtual void TabKeyClicked(bool clickedShift);
bool OnBoxPicked(Vector3 boxPos);
}
-Actor CMainMenuAppsView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuAppsView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
void ScrollToFocusedPage(float duration);
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
bool OnBoxPicked(Vector3 boxPos);
void CMainMenuBox::UpdateScreenReader(int nFocusOrder)
{
Actor self = Self();
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.SetFocusOrder(self, nFocusOrder++);
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_LABEL, mBoxName);
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, mBoxName);
//VIEWER_DBG("[TTS] Menu[%d][%s] order[%d]", mBoxId, mBoxName.c_str(), nFocusOrder);
if (m_BoxDeleteButton)
{
focusManager.SetFocusOrder(m_BoxDeleteButton, nFocusOrder++);
- focusManager.SetAccessibilityAttribute(m_BoxDeleteButton, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_BODY_DELETE_OPT_TTS"));
- focusManager.SetAccessibilityAttribute(m_BoxDeleteButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(m_BoxDeleteButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_BODY_DELETE_OPT_TTS"));
+ focusManager.SetAccessibilityAttribute(m_BoxDeleteButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
// propagate
}
}
-void CMainMenuBox::OnActivated()
+bool CMainMenuBox::OnAccessibilityActivated()
{
if (!mIsMenuBoxClicking)
{
OnClicked(mMenuBoxContainer);
+ return true;
}
+
+ return false;
}
bool CMainMenuBox::OnAccessibilityPan(const PanGesture& gesture)
// TTS
void UpdateScreenReader(int nFocusOrder);
- virtual void OnActivated();
+ virtual bool OnAccessibilityActivated();
virtual bool OnAccessibilityPan(const PanGesture& gesture);
virtual bool OnAccessibilityTouch(const TouchEvent& event);
void CMainMenuCustomBox::OnUpdateScreenReader()
{
Actor self = Self();
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
if(m_bSelectFolderItemState == APPS_VIEW_ADD_APPS_TO_FOLDER)
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_TPLATFORM_BODY_TICKBOX_T_TTS"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_TPLATFORM_BODY_TICKBOX_T_TTS"));
}
else
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
if (!mBoxData)
{
char buf[1024] = { 0, };
snprintf(buf, sizeof(buf), _("IDS_SCR_BODY_PD_UNREAD_ITEMS"), nBadgeCount);
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_HINT, buf);
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, buf);
}
else if (nBadgeCount == 1)
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_SCR_BODY_1_UNREAD_ITEM"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_SCR_BODY_1_UNREAD_ITEM"));
}
else
{
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_HINT, "");
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, "");
}
// VIEWER_DBG("[TTS] nBadgeCount[%d]", nBadgeCount);
void CMainMenuFolderBox::OnUpdateScreenReader()
{
Actor self = Self();
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
if (mBoxName.empty())
{
// if empty name, set label again
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_COM_HEADER_UNNAMED_FOLDER"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_COM_HEADER_UNNAMED_FOLDER"));
}
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_HEADER_FOLDER"));
- focusManager.SetAccessibilityAttribute(self, Toolkit::FocusManager::ACCESSIBILITY_VALUE, _("IDS_HELP_BODY_DOUBLE_TAP_TO_OPEN_TTS"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_HEADER_FOLDER"));
+ focusManager.SetAccessibilityAttribute(self, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_VALUE, _("IDS_HELP_BODY_DOUBLE_TAP_TO_OPEN_TTS"));
}
void CMainMenuFolderBox::SetFolderClickedCheckBox()
// Reset input variables for next keyboard edit.
mTitleInputState = false;
+ mTextDeleteButton.SetOpacity(0.0f);
+
mMainMenuFolderView.SetFolderViewTouchSensitive(true);
if(CHomeScreenViewManager::GetInstance()->GetCurrentViewType() != APPS_SCREEN_VIEW)
mMainMenuFolderView.SetTouchSensitive(false);
}
-#ifdef TIZEN_3_0
- // Set return the virtual keyboard return key type.
- VirtualKeyboard::SetReturnKeyType( VirtualKeyboard::DEFAULT );
-#else
+ // Set return the keyboard action button function.
Property::Map settingsMap;
settingsMap[ "ACTION_BUTTON" ] = InputMethod::ACTION_DEFAULT;
mFolderName.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, settingsMap );
-#endif
-
if(mFolderNameStr.empty())
{
if (nFocusGroup == FOCUS_GROUP_FOLDER_WINDOW)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
int nOrder = BASE_FOCUS_ORDER_FOLDER_WINDOW;
if (mFolderWindowBg)
{
focusManager.SetFocusOrder(mFolderWindowBg, nOrder++);
- focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_THE_FOLDER_IS_OPEN"));
- focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_DOUBLE_TAP_TO_CLOSE_T_TTS"));
+ focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_THE_FOLDER_IS_OPEN"));
+ focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_DOUBLE_TAP_TO_CLOSE_T_TTS"));
if (nFocusUpdateType == FOCUS_UPDATE_TYPE_RESET)
{
if (mFolderTextBg)
{
focusManager.SetFocusOrder(mFolderTextBg, nOrder++);
- focusManager.SetAccessibilityAttribute(mFolderTextBg, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_TPLATFORM_BODY_TITLE"));
+ focusManager.SetAccessibilityAttribute(mFolderTextBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_TPLATFORM_BODY_TITLE"));
if (!m_bFocusedActorActivatedSignalConnected)
{
*mFolderName.CutAndPasteToolBarDisplayedSignal().Disconnect(this, &Internal::CMainMenuFolderBox::_OnCutAndPasteToolBarDisplayed);
*/
-
if (mTitleInputState && mFolderName)
{
_SetFolderTitleStyle(FOLDER_CODE_TITLE_SIZE,FOLDER_CODE_TITLE_COLOR);
if (m_bFocusedActorActivatedSignalConnected)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.FocusedActorActivatedSignal().Disconnect(this, &CMainMenuFolderBox::_OnTTSFocusedActorActivated);
m_bFocusedActorActivatedSignalConnected = false;
}
aPressedImage.SetColor( FOLDER_CODE_DELETE_BTN_P_IMAGE_COLOR);
_SetFolderTitleStyle(FOLDER_CODE_TITLE_SIZE, FOLDER_CODE_TITLE_COLOR);
-#ifdef TIZEN_3_0
- // Set return the virtual keyboard return key type.
- VirtualKeyboard::SetReturnKeyType( VirtualKeyboard::DONE );
-#else
+ // Set return the keyboard action button function.
Property::Map settingsMap;
settingsMap[ "ACTION_BUTTON" ] = InputMethod::ACTION_DONE;
- mFolderName.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, settingsMap );
-#endif
+ textField.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, settingsMap );
ClusterHome3D::CMainMenuFolderBox handle( GetOwner() );
mFdTitleEditStartedSignal.Emit(handle);
{
TEST_DBG("TitleDelete button is clicked");
- //_SetFolderTitleStyle(FOLDER_CODE_TITLE_EDIT_SIZE, FOLDER_CODE_TITLE_EDIT_COLOR);
- //_SetFolderTitleGuideStyle(FOLDER_CODE_TITLE_GUIDE_SIZE,FOLDER_CODE_TITLE_GUIDE_COLOR);
-
mFolderNameStr.clear();
mFolderName.SetProperty(TextField::Property::TEXT, mFolderNameStr);
- //mTextDeleteButton.SetOpacity(0.0f);
-
- // Hide Clipboard and show Keypad.
- //Clipboard clipboard = Clipboard::Get();
- //clipboard.HideClipboard();
-#ifdef TIZEN_3_0
- VirtualKeyboard::Show();
-#endif
return false;
}
OnBoxDragged(menuBox, currentLeftPos, touchedScreenPos);
}
-Actor CMainMenuFolderBox::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderBox::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
- Actor self = Self();
Actor nextFocusActor;
nextFocusActor = mMainMenuFolderView.QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
void CMainMenuFolderBox::TabKeyClicked(bool clickedShift)
{
- Actor self = Self();
- Actor nextFocusActor;
- Actor currentFocusedActor;
-
- Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
- currentFocusedActor = kbdFocusManager.GetCurrentFocusActor();
- Actor focusGroup = kbdFocusManager.GetFocusGroup(currentFocusedActor);
-
- if(focusGroup && focusGroup.GetName() == "FolderPage")
- {
- mMainMenuFolderView.TabKeyClicked(clickedShift);
-
- nextFocusActor = kbdFocusManager.GetCurrentFocusActor();
- if(currentFocusedActor == nextFocusActor)
- {
- kbdFocusManager.SetCurrentFocusActor(mFolderTextBg);
- }
- }
- else
- {
- if(clickedShift)
- {
- mMainMenuFolderView.TabKeyClicked(clickedShift);
- }
- else
- {
- mMainMenuFolderView.TabKeyClicked(clickedShift);
- }
- }
+ mMainMenuFolderView.TabKeyClicked(clickedShift);
}
void CMainMenuFolderBox::_UpdateBadgeCount()
if (nFocusGroup == FOCUS_GROUP_FOLDER_WINDOW)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
if (mFolderWindowBg)
{
if (!folderNameStr.empty())
{
- focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::FocusManager::ACCESSIBILITY_LABEL, folderNameStr);
+ focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, folderNameStr);
}
else
{
- focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_COM_HEADER_UNNAMED_FOLDER"));
+ focusManager.SetAccessibilityAttribute(mFolderWindowBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_COM_HEADER_UNNAMED_FOLDER"));
}
}
if (!folderNameStr.empty())
{
- focusManager.SetAccessibilityAttribute(mFolderTextBg, Toolkit::FocusManager::ACCESSIBILITY_LABEL, folderNameStr);
+ focusManager.SetAccessibilityAttribute(mFolderTextBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, folderNameStr);
}
else
{
- focusManager.SetAccessibilityAttribute(mFolderTextBg, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_COM_HEADER_UNNAMED_FOLDER"));
+ focusManager.SetAccessibilityAttribute(mFolderTextBg, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_COM_HEADER_UNNAMED_FOLDER"));
}
}
}
void OnBoxDragInFolder(ClusterHome3D::CMainMenuBox& menuBox, Vector3 boxLeftPos, Vector3 touchedScreenPos);
// Focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
// badge
{
GetImpl(*this).OnBoxDragInFolder(menuBox, boxLeftPos, touchedScreenPos) ;
}
-Actor CMainMenuFolderBox::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderBox::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
void OnBoxDragInFolder(ClusterHome3D::CMainMenuBox& menuBox, Vector3 boxLeftPos, Vector3 touchedScreenPos);
// Focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
// badge
return aFirstActor;
}
-AppsViewFocusDirection CMainMenuFolderPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderPage::GetLastActor()
+{
+ Actor aLastActor;
+
+ if ( APPS_VIEW_MAIN_EDIT == m_eViewType && mIsAddButtonVisible) {
+ return mAddBoxButton;
+ }
+
+ if((int)mPageBoxes.size() <= 0) {
+ aLastActor = m_aTitleView;
+ } else {
+ mCurrentKeyFocusedBoxID = (int)mPageBoxes.size() - 1;
+ aLastActor = mPageBoxes[mCurrentKeyFocusedBoxID];
+ }
+ return aLastActor;
+}
+
+AppsViewFocusDirection CMainMenuFolderPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
AppsViewFocusDirection dir = APPS_VIEW_DIRECTION_STAY;
int nextBoxID = 0;
switch(direction)
{
- case Dali::Toolkit::Control::Right :
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
nextBoxID = mCurrentKeyFocusedBoxID + 1;
if(nextBoxID >= (int)mPageBoxes.size()) {
dir = APPS_VIEW_DIRECTION_RIGHT;
break;
// Left direction
- case Dali::Toolkit::Control::Left :
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
nextBoxID = mCurrentKeyFocusedBoxID - 1;
if(nextBoxID < 0) {
dir = APPS_VIEW_DIRECTION_LEFT;
break;
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
nextBoxID = mCurrentKeyFocusedBoxID - FOLDER_BOX_POSITION_COL_MAX;
if(nextBoxID < 0) {
dir = APPS_VIEW_DIRECTION_UP;
break;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
nextBoxID = mCurrentKeyFocusedBoxID + FOLDER_BOX_POSITION_COL_MAX;
if(nextBoxID >= (int)mPageBoxes.size()) {
dir = APPS_VIEW_DIRECTION_DOWN;
return dir;
}
-Actor CMainMenuFolderPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
+ Actor nextFocusActor;
+ int moveKeyboardBoxID = 0;
+
if(mPageBoxes.size() < 1)
{
return currentFocusedActor;
}
- Actor self = Self();
- Actor nextFocusActor;
- int moveKeyboardBoxID = 0;
-
switch(direction)
{
// Right direction
- case Dali::Toolkit::Control::Right :
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
TEST_DBG("Move a right box");
break;
// Left direction
- case Dali::Toolkit::Control::Left :
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
TEST_DBG("Move a left box");
break;
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID - FOLDER_BOX_POSITION_COL_MAX;
TEST_DBG("Move a up box");
break;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID + FOLDER_BOX_POSITION_COL_MAX;
TEST_DBG("Move a down box");
break;
}
// Check a folder range
- if(moveKeyboardBoxID >= 0 && moveKeyboardBoxID < (int)mPageBoxes.size())
- {
+ if(moveKeyboardBoxID >= 0 && moveKeyboardBoxID < (int)mPageBoxes.size()) {
nextFocusActor = mPageBoxes[moveKeyboardBoxID];
// Save a current focus actor
mCurrentKeyFocusedBoxID = moveKeyboardBoxID;
- }
- else
- {
+ } else {
if ( APPS_VIEW_MAIN_EDIT == m_eViewType && mIsAddButtonVisible && moveKeyboardBoxID >= 0) {
mCurrentKeyFocusedBoxID = (int)mPageBoxes.size();
return nextFocusActor;
}
-void CMainMenuFolderPage::TabKeyClicked(bool clickedShift)
+bool CMainMenuFolderPage::TabKeyClicked(bool clickedShift)
{
- Actor self = Self();
Actor nextFocusActor;
Actor currentFocusedActor;
int moveKeyboardBoxID = 0;
if(mPageBoxes.size() < 1)
{
- nextFocusActor = currentFocusedActor;
- }
+ return false;
+ }
+
+ if(clickedShift)
+ {
+ TEST_DBG("Shift + Tab");
+ moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
+
+ if(currentFocusedActor == mAddBoxButton) {
+ moveKeyboardBoxID = (int)mPageBoxes.size() - 1;
+ }
+ }
else
{
- if(focusGroup && focusGroup.GetName() != "FolderPage")
- {
- if(clickedShift)
- {
- TEST_DBG("Shift + Tab");
- mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
- }
- else
- {
- TEST_DBG("Tab");
- mCurrentKeyFocusedBoxID = 0;
- }
- nextFocusActor = mPageBoxes[mCurrentKeyFocusedBoxID];
+ TEST_DBG("Tab");
+ moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
+
+ if(currentFocusedActor == mAddBoxButton) {
+ moveKeyboardBoxID = - 1;
}
- else
- {
- if(clickedShift)
- {
- TEST_DBG("Shift + Tab");
- moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
- }
- else
- {
- TEST_DBG("Tab");
- moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
- }
+ }
- // Check a folder range
- if(moveKeyboardBoxID < 0 || moveKeyboardBoxID >= (int)mPageBoxes.size())
- {
- nextFocusActor = mPageBoxes[mCurrentKeyFocusedBoxID];
- }
- else
- {
- nextFocusActor = mPageBoxes[moveKeyboardBoxID];
+ // Check a folder range
+ if(moveKeyboardBoxID >= 0 && moveKeyboardBoxID < (int)mPageBoxes.size()) {
+ nextFocusActor = mPageBoxes[moveKeyboardBoxID];
- // Save a current focus actor
- mCurrentKeyFocusedBoxID = moveKeyboardBoxID;
- }
+ // Save a current focus actor
+ mCurrentKeyFocusedBoxID = moveKeyboardBoxID;
+ } else {
+ if ( APPS_VIEW_MAIN_EDIT == m_eViewType && mIsAddButtonVisible && moveKeyboardBoxID >= 0) {
+ mCurrentKeyFocusedBoxID = (int)mPageBoxes.size();
+
+ nextFocusActor = mAddBoxButton;
+ } else {
+ return false;
}
}
kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+
+ return true;
}
void CMainMenuFolderPage::UpdateScreenReader()
// check box event
void _OnCheckBoxEvent(ClusterHome3D::CMainMenuBox& box, bool bCheck);
- // Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
- void TabKeyClicked(bool clickedShift);
+ // Keyboard focus
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ bool TabKeyClicked(bool clickedShift);
// tts
void UpdateScreenReader();
void UpdateFolderContents();
Actor GetFirstActor();
- AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor GetLastActor();
+ AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void SetTitleView(Actor aTitleView);
ClusterHome3D::CMainMenuFolderPage::FolderBoxStatusChangedSignal& SignalConfirmFolderMenuBoxDeleted();
{
return GetImpl(*this).GetPreviousBoxesOnFolderPage(boxNum, boxList);
}
-Actor CMainMenuFolderPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
-void CMainMenuFolderPage::TabKeyClicked(bool clickedShift)
+bool CMainMenuFolderPage::TabKeyClicked(bool clickedShift)
{
- GetImpl(*this).TabKeyClicked(clickedShift);
+ return GetImpl(*this).TabKeyClicked(clickedShift);
}
void CMainMenuFolderPage::UpdateScreenReader()
return GetImpl(*this).GetFirstActor();
}
-AppsViewFocusDirection CMainMenuFolderPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderPage::GetLastActor()
+{
+ return GetImpl(*this).GetLastActor();
+}
+
+AppsViewFocusDirection CMainMenuFolderPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).GetNextFocusDirection(currentFocusedActor, direction);
}
int GetPreviousBoxesOnFolderPage(int boxNum, std::vector<ClusterHome3D::CMainMenuBox>& boxList);
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
- void TabKeyClicked(bool clickedShift);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ bool TabKeyClicked(bool clickedShift);
// tts
void UpdateScreenReader();
void UpdateFolderContents();
Actor GetFirstActor();
- AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor GetLastActor();
+ AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void SetTitleView(Actor aTitleView);
public:
return false;
}
-Actor CMainMenuFolderView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
ClusterHome3D::CMainMenuFolderPage focusedPage;
}
if(currentFocusedActor == m_aTitleView) {
- if(direction == Dali::Toolkit::Control::Down) {
+ if(direction == Dali::Toolkit::Control::KeyboardFocus::DOWN) {
nextFocusActor = focusedPage.GetFirstActor();
} else {
nextFocusActor = currentFocusedActor;
void CMainMenuFolderView::TabKeyClicked(bool clickedShift)
{
- ClusterHome3D::CMainMenuFolderPage focusedPage = mFolderPages[mFolderViewFocusedPage-1];
- if(focusedPage)
+ Actor nextFocusActor;
+ Actor currentFocusedActor;
+ ClusterHome3D::CMainMenuFolderPage focusedPage;
+
+ Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
+ currentFocusedActor = kbdFocusManager.GetCurrentFocusActor();
+ Actor focusGroup = kbdFocusManager.GetFocusGroup(currentFocusedActor);
+
+ if(mFolderPages.size() <= 0 || !(focusedPage = mFolderPages[mFolderViewFocusedPage-1]) )
{
- focusedPage.TabKeyClicked(clickedShift);
+ TEST_ERR("focusedPage is not found");
+ return ;
+ }
+
+ if(currentFocusedActor == m_aTitleView) {
+ if(clickedShift) {
+ nextFocusActor = focusedPage.GetLastActor();
+ } else {
+ nextFocusActor = focusedPage.GetFirstActor();
+ }
+ } else if(focusGroup && focusGroup.GetName() == "FolderPage") {
+ if(focusedPage.TabKeyClicked(clickedShift)) {
+ return ;
+ }
+
+ nextFocusActor = m_aTitleView;
}
else
{
- TEST_ERR("focusedPage is not found");
+ nextFocusActor = m_aTitleView;
}
+
+ kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
}
void CMainMenuFolderView::UpdateScreenReader()
char buf[1024] = { 0, };
snprintf(buf, sizeof(buf), _("IDS_HS_BODY_PAGE_P1SD_OF_P2SD"), GetFolderViewFocusedPage(), GetFolderViewPageCount());
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.SetFocusOrder(cMainMenuFolderPage, BASE_FOCUS_ORDER_APPS_VIEW_PAGE);
- focusManager.SetAccessibilityAttribute(cMainMenuFolderPage, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_HEADER_FOLDER"));
- focusManager.SetAccessibilityAttribute(cMainMenuFolderPage, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, buf);
- focusManager.SetAccessibilityAttribute(cMainMenuFolderPage, Toolkit::FocusManager::ACCESSIBILITY_HINT, _("IDS_STORYALBUM_BODY_SWIPE_WITH_TWO_FINGERS_TO_VIEW_NEXT_PAGE_TTS"));
+ focusManager.SetAccessibilityAttribute(cMainMenuFolderPage, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_HEADER_FOLDER"));
+ focusManager.SetAccessibilityAttribute(cMainMenuFolderPage, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, buf);
+ focusManager.SetAccessibilityAttribute(cMainMenuFolderPage, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT, _("IDS_STORYALBUM_BODY_SWIPE_WITH_TWO_FINGERS_TO_VIEW_NEXT_PAGE_TTS"));
cMainMenuFolderPage.UpdateScreenReader();
bool KeyClicked(HomeScreenKeyType eKeyType);
// keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
// tts
return GetImpl(*this).KeyClicked(eKeyType);
}
-Actor CMainMenuFolderView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuFolderView::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
virtual bool KeyClicked(HomeScreenKeyType eKeyType);
// Focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
void TabKeyClicked(bool clickedShift);
// tts
return mPageBoxes[GetFocusBoxByOrder(mPageBoxes.size() - 1)];
}
-AppsViewFocusDirection CMainMenuPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+AppsViewFocusDirection CMainMenuPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
AppsViewFocusDirection dir = APPS_VIEW_DIRECTION_STAY;
int nextBoxID = 0;
switch(direction)
{
- case Dali::Toolkit::Control::Right :
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
nextBoxID = mCurrentKeyFocusedBoxID + 1;
if(nextBoxID >= (int)mPageBoxes.size()) {
dir = APPS_VIEW_DIRECTION_RIGHT;
break;
// Left direction
- case Dali::Toolkit::Control::Left :
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
nextBoxID = mCurrentKeyFocusedBoxID - 1;
if(nextBoxID < 0) {
dir = APPS_VIEW_DIRECTION_LEFT;
break;
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
nextBoxID = mCurrentKeyFocusedBoxID - CUSTOM_GRID_MAX_COL;
if(nextBoxID < 0) {
dir = APPS_VIEW_DIRECTION_UP;
break;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
nextBoxID = mCurrentKeyFocusedBoxID + CUSTOM_GRID_MAX_COL;
if(nextBoxID >= (int)mPageBoxes.size()) {
dir = APPS_VIEW_DIRECTION_DOWN;
return dir;
}
-Actor CMainMenuPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
-{
- if(mPageBoxes.size() < 1)
- {
- return currentFocusedActor;
- }
+Actor CMainMenuPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
+{
Actor self = Self();
Actor nextFocusActor;
int moveKeyboardBoxID = 0;
Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
Actor focusGroup = kbdFocusManager.GetFocusGroup(currentFocusedActor);
+ if(mPageBoxes.size() < 1)
+ {
+ return currentFocusedActor;
+ }
+
// at the first time, just give a focus on Next1 button.
if(focusGroup != self)
{
- if(mPageBoxes.size() > 0)
+ switch(direction)
{
- switch(direction)
- {
- // Right direction
- case Dali::Toolkit::Control::Right :
- TEST_DBG("Move a right box");
- mCurrentKeyFocusedBoxID = 0;
- break;
-
- // Left direction
- case Dali::Toolkit::Control::Left :
- TEST_DBG("Move a left box");
- mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
- break;
-
- // Up direction
- case Dali::Toolkit::Control::Up :
- mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
- TEST_DBG("Move a up box");
- break;
-
- // Down direction
- case Dali::Toolkit::Control::Down :
- mCurrentKeyFocusedBoxID = 0;
- TEST_DBG("Move a down box");
- break;
-
- default :
- HOME_ERR("QueryNextFocusActor (Wrong direction)");
- break;
- }
- nextFocusActor = mPageBoxes[GetFocusBoxByOrder(mCurrentKeyFocusedBoxID)];
+ // Right direction
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
+ TEST_DBG("Move a right box");
+ mCurrentKeyFocusedBoxID = 0;
+ break;
+
+ // Left direction
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
+ TEST_DBG("Move a left box");
+ mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
+ break;
+
+ // Up direction
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
+ mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
+ TEST_DBG("Move a up box");
+ break;
+
+ // Down direction
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
+ mCurrentKeyFocusedBoxID = 0;
+ TEST_DBG("Move a down box");
+ break;
+
+ default :
+ HOME_ERR("QueryNextFocusActor (Wrong direction)");
+ break;
}
+ nextFocusActor = mPageBoxes[GetFocusBoxByOrder(mCurrentKeyFocusedBoxID)];
return nextFocusActor;
}
switch(direction)
{
// Right direction
- case Dali::Toolkit::Control::Right :
+ case Dali::Toolkit::Control::KeyboardFocus::RIGHT :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
TEST_DBG("Move a right box");
break;
// Left direction
- case Dali::Toolkit::Control::Left :
+ case Dali::Toolkit::Control::KeyboardFocus::LEFT :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
TEST_DBG("Move a left box");
break;
// Up direction
- case Dali::Toolkit::Control::Up :
+ case Dali::Toolkit::Control::KeyboardFocus::UP :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID - CUSTOM_GRID_MAX_COL;
TEST_DBG("Move a up box");
break;
// Down direction
- case Dali::Toolkit::Control::Down :
+ case Dali::Toolkit::Control::KeyboardFocus::DOWN :
moveKeyboardBoxID = mCurrentKeyFocusedBoxID + CUSTOM_GRID_MAX_COL;
TEST_DBG("Move a down box");
break;
return nextFocusActor;
}
-void CMainMenuPage::TabKeyClicked(bool clickedShift)
+bool CMainMenuPage::TabKeyClicked(bool clickedShift)
{
Actor self = Self();
Actor nextFocusActor;
if(mPageBoxes.size() < 1)
{
- nextFocusActor = currentFocusedActor;
- }
+ return true;
+ }
+
+ if(focusGroup != self)
+ {
+ if(clickedShift)
+ {
+ TEST_DBG("Shift + Tab");
+ mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
+ }
+ else
+ {
+ TEST_DBG("Tab");
+ mCurrentKeyFocusedBoxID = 0;
+ }
+ nextFocusActor = mPageBoxes[GetFocusBoxByOrder(mCurrentKeyFocusedBoxID)];
+ }
else
{
- if(focusGroup != self)
+ if(clickedShift)
{
- if(clickedShift)
- {
- TEST_DBG("Shift + Tab");
- mCurrentKeyFocusedBoxID = mPageBoxes.size() - 1;
- }
- else
- {
- TEST_DBG("Tab");
- mCurrentKeyFocusedBoxID = 0;
- }
- nextFocusActor = mPageBoxes[GetFocusBoxByOrder(mCurrentKeyFocusedBoxID)];
+ TEST_DBG("Shift + Tab");
+ moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
}
else
{
- if(clickedShift)
- {
- TEST_DBG("Shift + Tab");
- moveKeyboardBoxID = mCurrentKeyFocusedBoxID - 1;
- }
- else
- {
- TEST_DBG("Tab");
- moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
- }
-
- // Check a folder range
- if(moveKeyboardBoxID < 0 || moveKeyboardBoxID >= (int)mPageBoxes.size())
- {
- nextFocusActor = mPageBoxes[GetFocusBoxByOrder(mCurrentKeyFocusedBoxID)];
- }
- else
- {
- nextFocusActor = mPageBoxes[GetFocusBoxByOrder(moveKeyboardBoxID)];
+ TEST_DBG("Tab");
+ moveKeyboardBoxID = mCurrentKeyFocusedBoxID + 1;
+ }
- // Save a current focus actor
- mCurrentKeyFocusedBoxID = moveKeyboardBoxID;
- }
+ // Check a folder range
+ if(moveKeyboardBoxID < 0 || moveKeyboardBoxID >= (int)mPageBoxes.size())
+ {
+ return false;
}
+ else
+ {
+ nextFocusActor = mPageBoxes[GetFocusBoxByOrder(moveKeyboardBoxID)];
+
+ // Save a current focus actor
+ mCurrentKeyFocusedBoxID = moveKeyboardBoxID;
+ }
}
kbdFocusManager.SetCurrentFocusActor(nextFocusActor);
+
+ return true;
}
int CMainMenuPage::GetFocusBoxByOrder(int nOrder)
return -1;
}
-void CMainMenuPage::OnActivated()
+bool CMainMenuPage::OnAccessibilityActivated()
{
Actor actor = Self();
TapGesture tap;
_OnTap(actor, tap);
+ return true;
}
bool CMainMenuPage::OnAccessibilityTouch(const TouchEvent& event)
bool IsContain(Actor currentFocusedActor);
Actor GetFirstActor();
Actor GetLastActor();
- AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
- virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
- virtual void TabKeyClicked(bool clickedShift);
+ AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ virtual bool TabKeyClicked(bool clickedShift);
int GetFocusBoxByOrder(int nOrder);
// for screen reader
- virtual void OnActivated();
+ virtual bool OnAccessibilityActivated();
virtual bool OnAccessibilityTouch(const TouchEvent& event);
void SetBoxActionModeType(EBoxActionModeType eBoxActionModeType);
return GetImpl(*this).GetLastActor();
}
-AppsViewFocusDirection CMainMenuPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+AppsViewFocusDirection CMainMenuPage::GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).GetNextFocusDirection(currentFocusedActor, direction);
}
-Actor CMainMenuPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuPage::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
-void CMainMenuPage::TabKeyClicked(bool clickedShift)
+bool CMainMenuPage::TabKeyClicked(bool clickedShift)
{
- GetImpl(*this).TabKeyClicked(clickedShift);
+ return GetImpl(*this).TabKeyClicked(clickedShift);
}
void CMainMenuPage::SetBoxActionModeType(EBoxActionModeType eBoxActionModeType)
bool IsContain(Actor currentFocusedActor);
Actor GetFirstActor();
Actor GetLastActor();
- AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
- void TabKeyClicked(bool clickedShift);
+ AppsViewFocusDirection GetNextFocusDirection(Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
+ bool TabKeyClicked(bool clickedShift);
void SetBoxActionModeType(EBoxActionModeType eBoxActionModeType);
public:
m_ViewManager.ShowMenuView(TYPE_ALL_APPS);
}
-Actor CMainMenuPresenter::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuPresenter::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return m_ViewManager.QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
void ShowMainMenuView();
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
private:
void _Initialize();
ClusterHome3D::Accessibility::Get()->GetSignalFocusGroupChanged().Connect(this, &CMainMenuViewManager::_OnTTSFocusGroupChanged);
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.FocusedActorActivatedSignal().Connect(this, &CMainMenuViewManager::_OnTTSFocusedActorActivated);
}
void CMainMenuViewManager::_OnTTSFocusedActorActivated(Actor aActivatedActor)
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
int nFocusOrder = focusManager.GetFocusOrder(aActivatedActor);
VIEWER_DBG("_OnTTSFocusedActorActivated[%d]", nFocusOrder);
void CMainMenuViewManager::_UpdateScreenReader()
{
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
ClusterHome3D::Accessibility *cHomeAccessibility = ClusterHome3D::Accessibility::Get();
unsigned int nFocusUpdateType = cHomeAccessibility->GetFocusUpdateType();
if (m_CUtilTextImgTitle)
{
focusManager.SetFocusOrder(m_CUtilTextImgTitle, BASE_FOCUS_ORDER_TITLE);
- focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::FocusManager::ACCESSIBILITY_LABEL, m_CUtilTextImgTitle.GetText());
- focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_COM_HEADER_TITLE"));
+ focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, m_CUtilTextImgTitle.GetText());
+ focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_COM_HEADER_TITLE"));
if (nFocusUpdateType == FOCUS_UPDATE_TYPE_RESET)
{
if (m_aTitleRightButton)
{
focusManager.SetFocusOrder(m_aTitleRightButton, BASE_FOCUS_ORDER_TITLE + 2);
- focusManager.SetAccessibilityAttribute(m_aTitleRightButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(m_aTitleRightButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
if (m_aTitleLeftButton)
{
focusManager.SetFocusOrder(m_aTitleLeftButton, BASE_FOCUS_ORDER_TITLE + 1);
- focusManager.SetAccessibilityAttribute(m_aTitleLeftButton, Toolkit::FocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_OPT_CREATE_FOLDER_OPT_TTS"));
- focusManager.SetAccessibilityAttribute(m_aTitleLeftButton, Toolkit::FocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
+ focusManager.SetAccessibilityAttribute(m_aTitleLeftButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL, _("IDS_HS_OPT_CREATE_FOLDER_OPT_TTS"));
+ focusManager.SetAccessibilityAttribute(m_aTitleLeftButton, Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, _("IDS_HS_BODY_BUTTON_T_TTS"));
}
}
mFolderBox = box;
+ ClusterHome3D::CMainMenuFolderBox folderBox = ClusterHome3D::CMainMenuFolderBox::DownCast(mFolderBox);
+ mFolderBoxCount = folderBox.GetFolderViewItemCount();
+
m_eOldViewType = m_eViewType;
ChangeMainMenuVeiwType(APPS_VIEW_ADD_APPS_TO_FOLDER);
_UpdateTitleButtonText(_("IDS_MEMO_SK_ADD_ABB"));
char sSpeakBuf2[1024] = { 0, };
int itemCount =0;
- if( mFolderPopup )
- itemCount = mFolderPopup.GetFolderViewItemCount();
- if( bChecked && m_nCheckBoxCount + itemCount >= FOLDER_PAGE_MAX_ITEMS )
+ if( bChecked && m_nCheckBoxCount + mFolderBoxCount >= FOLDER_PAGE_MAX_ITEMS )
{
int ret = notification_status_message_post(_("IDS_HS_POP_NOT_ENOUGH_SPACE"));
if (ret != NOTIFICATION_ERROR_NONE)
HideAllCenterPopup();
}
-Actor CMainMenuViewManager::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuViewManager::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
Actor nextFocusActor;
if (m_bHomeScreenMenuPopupShowing)
void CMainMenuViewManager::TabKeyClicked(bool clickedShift)
{
- Toolkit::KeyboardFocusManager kbdFocusManager = Toolkit::KeyboardFocusManager::Get();
- Actor currentFocusActor = kbdFocusManager.GetCurrentFocusActor();
-
if (m_bHomeScreenMenuPopupShowing)
{
m_pHomeScreenMenuPopup.TabKeyClicked(clickedShift);
{
mMainMenuAppsView.TabKeyClicked(clickedShift);
- if(mMainMenuAppsView.GetShowingFolderBox())
- return;
-
- Actor nextFocusActor = kbdFocusManager.GetCurrentFocusActor();
- if(currentFocusActor == nextFocusActor)
- {
- TEST_DBG("Tab + Shift[%d]", clickedShift);
-
- if(clickedShift)
- {
- }
- else
- {
- if(m_ViewTitleBg.GetCurrentOpacity() == 1.0f)
- {
- if(m_aTitleLeftButton.IsSensitive())
- {
- kbdFocusManager.SetCurrentFocusActor(m_aTitleLeftButton);
- }
- else if(m_aTitleRightButton.IsSensitive())
- {
- kbdFocusManager.SetCurrentFocusActor(m_aTitleRightButton);
- }
- }
- }
- }
}
}
if (CHomeScreenViewManager::GetInstance()->GetCurrentViewType() == APPS_SCREEN_VIEW)
{
// clear focus
- Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
+ Toolkit::AccessibilityFocusManager focusManager = Toolkit::AccessibilityFocusManager::Get();
focusManager.ClearFocus();
if (m_eViewType == APPS_VIEW_MAIN_EDIT)
// Target folder
int m_nDeleteFolderId;
ClusterHome3D::CMainMenuBox mFolderBox;
+ int mFolderBoxCount;
Timer m_MenuBoxShowTimer;
// Box is on folder
void AppLanguageChanged(void);
// Keyboard focus
- virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ virtual Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
virtual void TabKeyClicked(bool clickedShift);
void MenuKeyClicked(std::string keyName);
GetImpl(*this).AppLanguageChanged();
}
-Actor CMainMenuViewManager::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction)
+Actor CMainMenuViewManager::QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
{
return GetImpl(*this).QueryNextFocusActor(currentFocusedActor, proposedActorToFocus, direction);
}
void AppLanguageChanged(void);
// Keyboard focus
- Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction);
+ Actor QueryNextFocusActor(Actor currentFocusedActor, Actor proposedActorToFocus, Dali::Toolkit::Control::KeyboardFocus::Direction direction);
// app paused
void AppPaused(void);
{
ImageActor CreateSolidColorActor( const Vector4& color, bool border, const Vector4& borderColor, const unsigned int borderSize )
{
-
-#ifdef TIZEN_3_0
ImageActor itemActor = ImageActor::New();
/* make bg */
Dali::Toolkit::Control control = Dali::Toolkit::Control::New();
control.SetBackgroundColor(color);
control.SetParentOrigin( ParentOrigin::CENTER );
control.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
- control.GetBackgroundActor().SetZ( 0.0f );
itemActor.Add ( control );
-#else
- ImageActor itemActor = Toolkit::CreateSolidColorActor( color );
-#endif
-
return itemActor;
}
ImageActor CreateTestSolidColorActor()
{
-#ifdef TIZEN_3_0
ImageActor itemActor = ImageActor::New();
Vector4 color;
Dali::Toolkit::Control control = Dali::Toolkit::Control::New();
control.SetBackgroundColor(Vector4((float)(rand()%10)/10, (float)(rand()%10)/10, (float)(rand()%10)/10, 0.5f));
control.SetParentOrigin( ParentOrigin::CENTER );
control.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
- control.GetBackgroundActor().SetZ( 0.0f );
itemActor.Add ( control );
itemActor.SetParentOrigin( ParentOrigin::CENTER );
itemActor.SetAnchorPoint( AnchorPoint::CENTER );
itemActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-
-#else
- ImageActor itemActor = Toolkit::CreateSolidColorActor( Vector4((float)(rand()%10)/10, (float)(rand()%10)/10, (float)(rand()%10)/10, 0.5f) );
- itemActor.SetParentOrigin( ParentOrigin::CENTER );
- itemActor.SetAnchorPoint( AnchorPoint::CENTER );
- itemActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-#endif
-
return itemActor;
}
}
projects / apps / native / home / homescreen.git / commitdiff