X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftable-view%2Ftable-view-impl.cpp;h=72d58afc11297a75273c0770846f422d872938bd;hp=9afaeed05ea073c5d89e70375bfa8b8d6916d39c;hb=f4d5b3ffc194fc1b1c14f4a79e3efa435a31bc32;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp index 9afaeed..72d58af 100644 --- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp @@ -794,7 +794,7 @@ void TableView::OnControlChildRemove( Actor& child ) } TableView::TableView( unsigned int initialRows, unsigned int initialColumns ) -: ControlImpl( true ), // requires touch +: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), mCellData( initialRows, initialColumns ), mLayoutingChild( false ), mConstraintDuration( DEFAULT_CONSTRAINT_DURATION ) @@ -1000,7 +1000,7 @@ TableView::~TableView() // nothing to do } -Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled) +Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled) { Actor nextFocusableActor; @@ -1023,7 +1023,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro switch ( direction ) { - case Control::Left: + case Toolkit::Control::Left: { if(--currentColumn < 0) { @@ -1036,7 +1036,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro } break; } - case Control::Right: + case Toolkit::Control::Right: { if(++currentColumn > numberOfColumns - 1) { @@ -1049,7 +1049,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro } break; } - case Control::Up: + case Toolkit::Control::Up: { if(--currentRow < 0) { @@ -1058,7 +1058,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro } break; } - case Control::Down: + case Toolkit::Control::Down: { if(++currentRow > numberOfRows - 1) {