Merge "Added nested TableView KeyboardFocus support" into devel/master

diff --combined dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index 0bace7e,b616fcf..a674abb
--- 1/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
--- 2/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -795,8 -795,6 +795,8 @@@ void TableView::OnSizeSet( const Vector
    // rows and columns must be recalculated or the new size will not take effect.
    mRowDirty = mColumnDirty = true;
    RelayoutRequest();
 +
 +  Control::OnSizeSet( size );
  }
  
  void TableView::OnRelayout( const Vector2& size, RelayoutContainer& container )
@@@ -963,101 -961,98 +963,101 @@@ Property::Value TableView::GetProperty
  
  void TableView::OnChildAdd( Actor& child )
  {
 -  Control::OnChildAdd( child );
 -
 -  if( mLayoutingChild )
 +  if( ! mLayoutingChild )
    {
 -    // we're in the middle of laying out children so no point doing anything here
 -    return;
 -  }
 +    // Ensure we're not in the middle of laying out children
  
 -  // Check child properties on actor to decide its position inside the table
 -  HorizontalAlignment::Type horizontalAlignment = HorizontalAlignment::LEFT;
 -  VerticalAlignment::Type verticalAlignment = VerticalAlignment::TOP;
 +    // Check child properties on actor to decide its position inside the table
 +    HorizontalAlignment::Type horizontalAlignment = HorizontalAlignment::LEFT;
 +    VerticalAlignment::Type verticalAlignment = VerticalAlignment::TOP;
  
 -  if( child.GetPropertyType( Toolkit::TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT ) != Property::NONE )
 -  {
 -    std::string value = child.GetProperty( Toolkit::TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT ).Get<std::string >();
 -    Scripting::GetEnumeration< HorizontalAlignment::Type >( value.c_str(),
 -                                                            HORIZONTAL_ALIGNMENT_STRING_TABLE,
 -                                                            HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT,
 -                                                            horizontalAlignment );
 -  }
 +    if( child.GetPropertyType( Toolkit::TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT ) != Property::NONE )
 +    {
 +      std::string value = child.GetProperty( Toolkit::TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT ).Get<std::string >();
 +      Scripting::GetEnumeration< HorizontalAlignment::Type >( value.c_str(),
 +                                                              HORIZONTAL_ALIGNMENT_STRING_TABLE,
 +                                                              HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT,
 +                                                              horizontalAlignment );
 +    }
  
 -  if( child.GetPropertyType( Toolkit::TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT ) != Property::NONE )
 -  {
 -    std::string value = child.GetProperty( Toolkit::TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT ).Get<std::string >();
 -    Scripting::GetEnumeration< VerticalAlignment::Type >( value.c_str(),
 -                                                          VERTICAL_ALIGNMENT_STRING_TABLE,
 -                                                          VERTICAL_ALIGNMENT_STRING_TABLE_COUNT,
 -                                                          verticalAlignment );
 -  }
 +    if( child.GetPropertyType( Toolkit::TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT ) != Property::NONE )
 +    {
 +      std::string value = child.GetProperty( Toolkit::TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT ).Get<std::string >();
 +      Scripting::GetEnumeration< VerticalAlignment::Type >( value.c_str(),
 +                                                            VERTICAL_ALIGNMENT_STRING_TABLE,
 +                                                            VERTICAL_ALIGNMENT_STRING_TABLE_COUNT,
 +                                                            verticalAlignment );
 +    }
  
 -  Toolkit::TableView::CellPosition cellPosition;
 -  if( child.GetPropertyType( Toolkit::TableView::ChildProperty::ROW_SPAN ) != Property::NONE )
 -  {
 -    cellPosition.rowSpan = static_cast<unsigned int>( child.GetProperty( Toolkit::TableView::ChildProperty::ROW_SPAN ).Get<float>() );
 -  }
 +    Toolkit::TableView::CellPosition cellPosition;
 +    if( child.GetPropertyType( Toolkit::TableView::ChildProperty::ROW_SPAN ) != Property::NONE )
 +    {
 +      cellPosition.rowSpan = static_cast<unsigned int>( child.GetProperty( Toolkit::TableView::ChildProperty::ROW_SPAN ).Get<float>() );
 +    }
  
 -  if( child.GetPropertyType( Toolkit::TableView::ChildProperty::COLUMN_SPAN ) != Property::NONE )
 -  {
 -    cellPosition.columnSpan = static_cast<unsigned int>( child.GetProperty( Toolkit::TableView::ChildProperty::COLUMN_SPAN ).Get<float>() );
 -  }
 +    if( child.GetPropertyType( Toolkit::TableView::ChildProperty::COLUMN_SPAN ) != Property::NONE )
 +    {
 +      cellPosition.columnSpan = static_cast<unsigned int>( child.GetProperty( Toolkit::TableView::ChildProperty::COLUMN_SPAN ).Get<float>() );
 +    }
  
 -  if( child.GetPropertyType( Toolkit::TableView::ChildProperty::CELL_INDEX ) != Property::NONE )
 -  {
 -    Vector2 indices = child.GetProperty( Toolkit::TableView::ChildProperty::CELL_INDEX ).Get<Vector2 >();
 -    cellPosition.rowIndex = static_cast<unsigned int>( indices.x );
 -    cellPosition.columnIndex = static_cast<unsigned int>( indices.y );
 +    if( child.GetPropertyType( Toolkit::TableView::ChildProperty::CELL_INDEX ) != Property::NONE )
 +    {
 +      Vector2 indices = child.GetProperty( Toolkit::TableView::ChildProperty::CELL_INDEX ).Get<Vector2 >();
 +      cellPosition.rowIndex = static_cast<unsigned int>( indices.x );
 +      cellPosition.columnIndex = static_cast<unsigned int>( indices.y );
  
 -    AddChild( child, cellPosition );
 -    SetCellAlignment(cellPosition, horizontalAlignment, verticalAlignment);
 +      AddChild( child, cellPosition );
 +      SetCellAlignment(cellPosition, horizontalAlignment, verticalAlignment);
 +    }
 +    else
 +    {
 +      bool availableCellFound = false;
  
 -    // Do not continue
 -    return;
 -  }
 +      // Find the first available cell to store the actor in
 +      const unsigned int rowCount = mCellData.GetRows();
 +      const unsigned int columnCount = mCellData.GetColumns();
 +      for( unsigned int row = 0; row < rowCount && !availableCellFound; ++row )
 +      {
 +        for( unsigned int column = 0; column < columnCount && !availableCellFound; ++column )
 +        {
 +          if( !(mCellData[ row ][ column ].actor) )
 +          {
 +            // Put the actor in the cell
 +            CellData data;
 +            data.actor = child;
 +            data.position.columnIndex = column;
 +            data.position.rowIndex = row;
 +            data.horizontalAlignment = horizontalAlignment;
 +            data.verticalAlignment = verticalAlignment;
 +            mCellData[ row ][ column ] = data;
 +
 +            availableCellFound = true;
 +            break;
 +          }
 +        }
 +      }
  
 -  // Find the first available cell to store the actor in
 -  const unsigned int rowCount = mCellData.GetRows();
 -  const unsigned int columnCount = mCellData.GetColumns();
 -  for( unsigned int row = 0; row < rowCount; ++row )
 -  {
 -    for( unsigned int column = 0; column < columnCount; ++column )
 -    {
 -      if( !(mCellData[ row ][ column ].actor) )
 +      if( ! availableCellFound )
        {
 -        // Put the actor in the cell
 +        // No empty cells, so increase size of the table
 +        unsigned int newColumnCount = ( columnCount > 0 ) ? columnCount : 1;
 +        ResizeContainers( rowCount + 1, newColumnCount );
 +
 +        // Put the actor in the first cell of the new row
          CellData data;
          data.actor = child;
 -        data.position.columnIndex = column;
 -        data.position.rowIndex = row;
 +        data.position.rowIndex = rowCount;
 +        data.position.columnIndex = 0;
          data.horizontalAlignment = horizontalAlignment;
          data.verticalAlignment = verticalAlignment;
 -        mCellData[ row ][ column ] = data;
 -
 -        // Don't continue
 -        RelayoutRequest();
 -        return;
 +        mCellData[ rowCount ][ 0 ] = data;
        }
 +
 +      RelayoutRequest();
      }
    }
  
 -  // No empty cells, so increase size of the table
 -  unsigned int newColumnCount = ( columnCount > 0 ) ? columnCount : 1;
 -  ResizeContainers( rowCount + 1, newColumnCount );
 -
 -  // Put the actor in the first cell of the new row
 -  CellData data;
 -  data.actor = child;
 -  data.position.rowIndex = rowCount;
 -  data.position.columnIndex = 0;
 -  data.horizontalAlignment = horizontalAlignment;
 -  data.verticalAlignment = verticalAlignment;
 -  mCellData[ rowCount ][ 0 ] = data;
 -  RelayoutRequest();
 +  Control::OnChildAdd( child );
  }
  
  void TableView::OnChildRemove( Actor& child )
@@@ -1082,6 -1077,8 +1082,8 @@@ TableView::TableView( unsigned int init
    mRowDirty( true ),     // Force recalculation first time
    mColumnDirty( true )
  {
+   mCurrentColumn = 0;
+   mCurrentRow = 0;
    SetKeyboardNavigationSupport( true );
    ResizeContainers( initialRows, initialColumns );
  }
@@@ -1403,13 -1400,42 +1405,42 @@@ Actor TableView::GetNextKeyboardFocusab
        // Move the focus if we haven't lost it.
        if(!focusLost)
        {
+         // Save the new focus cell positions of TableView.
+         mCurrentColumn = currentColumn;
+         mCurrentRow = currentRow;
+ 
          nextFocusableActor = GetChildAt(Toolkit::TableView::CellPosition(currentRow, currentColumn));
        }
      }
      else
      {
-       // The current focused actor is not within table view, so the child in the first cell should be focused.
-       nextFocusableActor = GetChildAt(Toolkit::TableView::CellPosition(0, 0));
+       // The current focused actor is not within TableView.
+       // This means that the TableView has gained the Focus again.
+ 
+       unsigned int numberOfColumns = GetColumns();
+       unsigned int numberOfRows = GetRows();
+ 
+       if( (mCurrentRow != 0 && mCurrentColumn != 0) && // Last saved cell was not the first cell
+           (mCurrentRow != numberOfRows - 1 && mCurrentColumn != numberOfColumns - 1) ) // Last saved cell was not the last cell
+       {
+         // This condition handles the cases when parent TableView gained the focus again after the child layout
+         // container (i.e. TableView) has no more items (i.e. actors) to be focused on in a given direction.
+ 
+         // Move the focus to next cell towards the given direction in a TableView if the last saved cell was not the first or last cell.
+         nextFocusableActor = GetNextKeyboardFocusableActor(GetChildAt(Toolkit::TableView::CellPosition(mCurrentRow, mCurrentColumn)), direction, loopEnabled);
+       }
+       else
+       {
+         // Otherwise, move the focus to either the first or the last cell according to the given direction.
+         if(direction == Toolkit::Control::KeyboardFocus::LEFT || direction == Toolkit::Control::KeyboardFocus::UP)
+         {
+           nextFocusableActor = GetChildAt(Toolkit::TableView::CellPosition(numberOfRows - 1, numberOfColumns - 1));
+         }
+         else
+         {
+           nextFocusableActor = GetChildAt(Toolkit::TableView::CellPosition(0, 0));
+         }
+       }
      }
    }