X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.cpp;h=1519920669316a488d6b944eab03a3d8d4c100b5;hp=aea6c506fc4dd5672ede8fcce9a784c42c167092;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hpb=7cfada64ad44d4a47785d49993b298f1c2dbd4a0

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index aea6c50..1519920 100644
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -24,7 +24,8 @@
 #include <dali/public-api/object/type-registry-helper.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace Dali
 {
@@ -47,7 +48,7 @@ DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ToolBar, Toolkit::Control, Create )
 DALI_TYPE_REGISTRATION_END()
 
 const float DEFAULT_RELATIVE_SIZE( 0.1f );
-const Toolkit::Alignment::Type DEFAULT_ALIGNMENT( Toolkit::Alignment::HorizontalLeft );
+const Toolkit::Alignment::Type DEFAULT_ALIGNMENT( Toolkit::Alignment::HORIZONTAL_LEFT );
 } // namespace
 
 Toolkit::ToolBar ToolBar::New()
@@ -71,7 +72,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment:
   unsigned int index = 0;
   switch( alignment )
   {
-    case Toolkit::Alignment::HorizontalLeft:
+    case Toolkit::Alignment::HORIZONTAL_LEFT:
     {
       index = mLeftOffset;
       ++mLeftOffset;
@@ -79,14 +80,14 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment:
       ++mRightBase;
       break;
     }
-    case Toolkit::Alignment::HorizontalCenter:
+    case Toolkit::Alignment::HORIZONTAL_CENTER:
     {
       index = mCenterBase + mCenterOffset;
       ++mCenterOffset;
       ++mRightBase;
       break;
     }
-    case Toolkit::Alignment::HorizontalRight:
+    case Toolkit::Alignment::HORIZONTAL_RIGHT:
     {
       index = mRightBase - mRightOffset;
       ++mRightBase;
@@ -122,7 +123,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment:
   // Update spaces between left, center and right groups of controls.
   switch( alignment )
   {
-    case Toolkit::Alignment::HorizontalLeft:
+    case Toolkit::Alignment::HORIZONTAL_LEFT:
     {
       mLeftRelativeSpace -= relativeSize;
       if ( mLeftRelativeSpace < 0.f )
@@ -131,7 +132,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment:
       }
       break;
     }
-    case Toolkit::Alignment::HorizontalCenter:
+    case Toolkit::Alignment::HORIZONTAL_CENTER:
     {
       mLeftRelativeSpace -= 0.5f * relativeSize;
       if ( mLeftRelativeSpace < 0.f )
@@ -145,7 +146,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment:
       }
       break;
     }
-    case Toolkit::Alignment::HorizontalRight:
+    case Toolkit::Alignment::HORIZONTAL_RIGHT:
     {
       mRightRelativeSpace -= relativeSize;
       if ( mRightRelativeSpace < 0.f )
@@ -179,18 +180,18 @@ void ToolBar::RemoveControl( Actor control )
     // Update spaces between left, center and right groups of controls.
     if( 1.0 > mAccumulatedRelativeSpace )
     {
-      Toolkit::Alignment::Type alignment = Toolkit::Alignment::HorizontalLeft;
+      Toolkit::Alignment::Type alignment = Toolkit::Alignment::HORIZONTAL_LEFT;
       if( position.columnIndex < mLeftOffset )
       {
-        alignment = Toolkit::Alignment::HorizontalLeft;
+        alignment = Toolkit::Alignment::HORIZONTAL_LEFT;
       }
       else if( ( position.columnIndex > mLeftOffset ) && ( position.columnIndex < mCenterBase + mCenterOffset ) )
       {
-        alignment = Toolkit::Alignment::HorizontalCenter;
+        alignment = Toolkit::Alignment::HORIZONTAL_CENTER;
       }
       else if( position.columnIndex > mCenterBase + mCenterOffset )
       {
-        alignment = Toolkit::Alignment::HorizontalRight;
+        alignment = Toolkit::Alignment::HORIZONTAL_RIGHT;
       }
       else
       {
@@ -201,7 +202,7 @@ void ToolBar::RemoveControl( Actor control )
 
       switch( alignment )
       {
-        case Toolkit::Alignment::HorizontalLeft:
+        case Toolkit::Alignment::HORIZONTAL_LEFT:
         {
           mLeftRelativeSpace += relativeSize;
           if ( mLeftRelativeSpace < 0.f )
@@ -210,7 +211,7 @@ void ToolBar::RemoveControl( Actor control )
           }
           break;
         }
-        case Toolkit::Alignment::HorizontalCenter:
+        case Toolkit::Alignment::HORIZONTAL_CENTER:
         {
           mLeftRelativeSpace += 0.5f * relativeSize;
           if ( mLeftRelativeSpace < 0.f )
@@ -224,7 +225,7 @@ void ToolBar::RemoveControl( Actor control )
           }
           break;
         }
-        case Toolkit::Alignment::HorizontalRight:
+        case Toolkit::Alignment::HORIZONTAL_RIGHT:
         {
           mRightRelativeSpace += relativeSize;
           if ( mRightRelativeSpace < 0.f )
@@ -313,6 +314,11 @@ void ToolBar::OnInitialize()
   mLayout.AddChild( rightSpace, Toolkit::TableView::CellPosition( 0, 1 ) );
   mLayout.SetRelativeWidth( 0, mLeftRelativeSpace );
   mLayout.SetRelativeWidth( 1, mRightRelativeSpace );
+
+  DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+    return std::unique_ptr< Dali::Accessibility::Accessible >(
+      new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::TOOL_BAR ));
+  } );
 }
 
 void ToolBar::OnChildAdd(Actor& child)