Moved ControlImpl to Internal namespace & renamed to Control

[problem]      TypeRegistry does not have an entry for ControlImpl but that is what all
               ControlImpl objects are set to when using GetTypeName() etc.
[cause]        This means we cannot use control properly with the type-registry.
               Everywhere else, the namespaces are stripped from the typeid name so for
               Internal::ImageActor we just have ImageActor and this matches the entry
               for ImageActor in the type-registry.
               However, for Control, we only have an entry for Control, not ControlImpl so there
               is no match.
[solution]     By moving ControlImpl to Internal::Control we will have the match in the
               type-registry.
               Added typedef for ControlImpl so applications will only have to be recompiled.

Change-Id: I50d63b27f0fc6af0e8de1c59757e0a9324354c63
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
index d381f5c..19ca1e7 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
@@ -690,10 +690,11 @@ int UtcDaliPushButtonProperties(void)
     DALI_TEST_EQUALS( "IMAGE_PATH_2", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
 
     Property::Map map;
     DALI_TEST_EQUALS( "IMAGE_PATH_2", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
 
     Property::Map map;

-    map.push_back( Property::StringValuePair( "type", "TextActor" ) );
+    map.push_back( Property::StringValuePair( "type", "Actor" ) );

 
     button.SetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR, map );
 
     button.SetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR, map );

-    DALI_TEST_EQUALS( "TextActor", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+    DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+    DALI_TEST_CHECK( "ImageActor" != button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >() );

   }
 
   //  PushButton::PROPERTY_DIMMED_STATE_ACTOR
   }
 
   //  PushButton::PROPERTY_DIMMED_STATE_ACTOR

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index df988c0..8640002 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -65,7 +65,7 @@ DummyControl DummyControlImpl::New()
 }
 
 DummyControlImpl::DummyControlImpl()
 }
 
 DummyControlImpl::DummyControlImpl()

-: ControlImpl(true)
+: Control(true)

 {
 }
 
 {
 }
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
index cf2d965..649ac0a 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
@@ -61,22 +61,22 @@ public: // Not intended for application developers
 };
 
 /**
 };
 
 /**

- * Cannot create an instance of ControlImpl, so use this dummy class for the implementation.
- * This class does not override any of ControlImpl's behaviour.
+ * Cannot create an instance of Internal::Control, so use this dummy class for the implementation.
+ * This class does not override any of Internal::Control's behaviour.

  */
  */

-class DummyControlImpl : public ControlImpl
+class DummyControlImpl : public Internal::Control

 {
 public:
 
   static DummyControl New();
 
 public:
 {
 public:
 
   static DummyControl New();
 
 public:

-  inline void EnableGestureDetection(Gesture::Type type) { ControlImpl::EnableGestureDetection(type); }
-  inline void DisableGestureDetection(Gesture::Type type) { ControlImpl::DisableGestureDetection(type); }
-  inline PinchGestureDetector GetPinchGestureDetector() const { return ControlImpl::GetPinchGestureDetector(); }
-  inline PanGestureDetector GetPanGestureDetector() const { return ControlImpl::GetPanGestureDetector(); }
-  inline TapGestureDetector GetTapGestureDetector() const { return ControlImpl::GetTapGestureDetector(); }
-  inline LongPressGestureDetector GetLongPressGestureDetector() const { return ControlImpl::GetLongPressGestureDetector(); }
+  inline void EnableGestureDetection(Gesture::Type type) { Internal::Control::EnableGestureDetection(type); }
+  inline void DisableGestureDetection(Gesture::Type type) { Internal::Control::DisableGestureDetection(type); }
+  inline PinchGestureDetector GetPinchGestureDetector() const { return Internal::Control::GetPinchGestureDetector(); }
+  inline PanGestureDetector GetPanGestureDetector() const { return Internal::Control::GetPanGestureDetector(); }
+  inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
+  inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); }

 
 protected:
 
 
 protected:
 


@@ -86,8 +86,8 @@ protected:
 };
 
 /**
 };
 
 /**

- * Cannot create an instance of ControlImpl, so use this dummy class for the implementation.
- * This class DOES override ControlImpl's behaviour.
+ * Cannot create an instance of Internal::Control, so use this dummy class for the implementation.
+ * This class DOES override Internal::Control's behaviour.

  */
 class DummyControlImplOverride : public DummyControlImpl
 {
  */
 class DummyControlImplOverride : public DummyControlImpl
 {


@@ -101,7 +101,7 @@ private:
 
   virtual ~DummyControlImplOverride();
 
 
   virtual ~DummyControlImplOverride();
 

-private: // From ControlImpl
+private: // From Internal::Control

 
   virtual void OnInitialize();
   virtual void OnStyleChange(StyleChange change);
 
   virtual void OnInitialize();
   virtual void OnStyleChange(StyleChange change);

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index 095879b..e816ff6 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@ -200,7 +200,7 @@ int UtcDaliControlGetImplementation(void)
   {
     try
     {
   {
     try
     {

-      ControlImpl& controlImpl = control.GetImplementation();
+      Toolkit::Internal::Control& controlImpl = control.GetImplementation();

       (void)controlImpl; // Avoid unused warning
       tet_result(TET_FAIL);
     }
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_FAIL);
     }


@@ -215,7 +215,7 @@ int UtcDaliControlGetImplementation(void)
     try
     {
       const DummyControl constControl(control);
     try
     {
       const DummyControl constControl(control);

-      const ControlImpl& controlImpl = constControl.GetImplementation();
+      const Toolkit::Internal::Control& controlImpl = constControl.GetImplementation();

       (void)controlImpl; // Avoid unused warning
       tet_result(TET_FAIL);
     }
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_FAIL);
     }


@@ -231,7 +231,7 @@ int UtcDaliControlGetImplementation(void)
   {
     try
     {
   {
     try
     {

-      ControlImpl& controlImpl = control.GetImplementation();
+      Toolkit::Internal::Control& controlImpl = control.GetImplementation();

       (void)controlImpl; // Avoid unused warning
       tet_result(TET_PASS);
     }
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_PASS);
     }


@@ -246,7 +246,7 @@ int UtcDaliControlGetImplementation(void)
     try
     {
       const DummyControl constControl(control);
     try
     {
       const DummyControl constControl(control);

-      const ControlImpl& controlImpl = constControl.GetImplementation();
+      const Toolkit::Internal::Control& controlImpl = constControl.GetImplementation();

       (void)controlImpl; // Avoid unused warning
       tet_result(TET_PASS);
     }
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_PASS);
     }

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
index 5152b05..f704531 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@ -54,7 +54,7 @@ int UtcDaliControlImplNew(void)
 
   DALI_TEST_CHECK( !Control::DownCast(control) );
 
 
   DALI_TEST_CHECK( !Control::DownCast(control) );
 

-  control = ControlImpl::New();
+  control = Toolkit::Internal::Control::New();

 
   DALI_TEST_CHECK( Control::DownCast(control) );
   END_TEST;
 
   DALI_TEST_CHECK( Control::DownCast(control) );
   END_TEST;

diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index fa09991..e661a87 100644 (file)
--- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -560,7 +560,7 @@ void Alignment::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
     }
 
     Vector3 actorSize ( actor.GetCurrentSize() );
     }
 
     Vector3 actorSize ( actor.GetCurrentSize() );

-    Control control( Control::DownCast( actor ) );
+    Toolkit::Control control( Toolkit::Control::DownCast( actor ) );

     if ( actorSize == Vector3::ZERO && control )
     {
       actorSize = control.GetNaturalSize();
     if ( actorSize == Vector3::ZERO && control )
     {
       actorSize = control.GetNaturalSize();


@@ -623,7 +623,7 @@ void Alignment::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
 }
 
 Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
 }
 
 Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )

-: ControlImpl( false ),  // doesn't require touch events
+: Control( false ),  // doesn't require touch events

   mHorizontal( horizontal ),
   mVertical( vertical ),
   mScaling( Toolkit::Alignment::ScaleNone ),
   mHorizontal( horizontal ),
   mVertical( vertical ),
   mScaling( Toolkit::Alignment::ScaleNone ),

diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.h b/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
index 25d9ea4..73f51d6 100644 (file)
--- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
+++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
@@ -36,7 +36,7 @@ namespace Internal
  * Alignment is a control to position and resize actors inside other container actors.
  * @see Dali::Toolkit::Alignment for more details.
  */
  * Alignment is a control to position and resize actors inside other container actors.
  * @see Dali::Toolkit::Alignment for more details.
  */

-class Alignment : public ControlImpl
+class Alignment : public Control

 {
 public:
 
 {
 public:
 


@@ -81,7 +81,7 @@ public:
 private: // From Control
 
   /**
 private: // From Control
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()

    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 9c1c340..8536b0b 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -52,7 +52,7 @@ PropertyRegistration property1( typeRegistration, "dimmed", Toolkit::Button::PRO
 } // unnamed namespace
 
 Button::Button()
 } // unnamed namespace
 
 Button::Button()

-: ControlImpl( true ),
+: Control( true ),

   mState( ButtonUp ),
   mDimmed( false ),
   mPainter( NULL )
   mState( ButtonUp ),
   mDimmed( false ),
   mPainter( NULL )

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.h b/base/dali-toolkit/internal/controls/buttons/button-impl.h
index d7df9f0..076777a 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.h
@@ -37,14 +37,14 @@ namespace Internal
 /**
  * Button is the base class implementation for all buttons.
  */
 /**
  * Button is the base class implementation for all buttons.
  */

-class Button : public ControlImpl
+class Button : public Control

 {
 public:
 
   // Properties
   enum
   {
 {
 public:
 
   // Properties
   enum
   {

-    BUTTON_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+    BUTTON_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,

     BUTTON_PROPERTY_END_INDEX = BUTTON_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 
     BUTTON_PROPERTY_END_INDEX = BUTTON_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 


@@ -172,7 +172,7 @@ protected: // From CustomActorImpl
    */
   virtual bool OnTouchEvent( const TouchEvent& event );
 
    */
   virtual bool OnTouchEvent( const TouchEvent& event );
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()

diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index 500cc09..45bb173 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -154,7 +154,7 @@ public:
    */
   Actor& GetFadeOutCheckedImage();
 
    */
   Actor& GetFadeOutCheckedImage();
 

-protected: // From ControlImpl
+protected: // From Control

 
   /**
    * Respond the activate notification.
 
   /**
    * Respond the activate notification.

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index d007c03..4f87d38 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@ -705,7 +705,7 @@ void PushButton::OnActivated()
 
 Vector3 PushButton::GetNaturalSize()
 {
 
 Vector3 PushButton::GetNaturalSize()
 {

-  Vector3 size = ControlImpl::GetNaturalSize();
+  Vector3 size = Control::GetNaturalSize();

 
   const bool widthIsZero = EqualsZero( size.width );
   const bool heightIsZero = EqualsZero( size.height );
 
   const bool widthIsZero = EqualsZero( size.width );
   const bool heightIsZero = EqualsZero( size.height );

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
index 8f65610..7ea0239 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
@@ -320,7 +320,7 @@ protected: // From Button
    */
   virtual float OnAnimationTimeRequested() const;
 
    */
   virtual float OnAnimationTimeRequested() const;
 

-protected: // From ControlImpl
+protected: // From Control

 
   /**
    * Respond the activate notification.
 
   /**
    * Respond the activate notification.

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 88a88ed..47995d4 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -169,7 +169,7 @@ Dali::Toolkit::Popup Popup::New()
 }
 
 Popup::Popup(PopupStyle& style)
 }
 
 Popup::Popup(PopupStyle& style)

-: ControlImpl(true),
+: Control(true),

   mShowing(false),
   mState(Toolkit::Popup::POPUP_NONE), // Initially, the popup state should not be set, it's set in OnInitialize
   mAlterAddedChild(false),
   mShowing(false),
   mState(Toolkit::Popup::POPUP_NONE), // Initially, the popup state should not be set, it's set in OnInitialize
   mAlterAddedChild(false),


@@ -902,7 +902,7 @@ float Popup::GetWidthForHeight( float height )
   return GetNaturalSize().width;
 }
 
   return GetNaturalSize().width;
 }
 

-Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
+Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)

 {
   Actor nextFocusableActor( currentFocusedActor );
 
 {
   Actor nextFocusableActor( currentFocusedActor );
 


@@ -945,7 +945,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::K
       {
         switch ( direction )
         {
       {
         switch ( direction )
         {

-          case Control::Left:
+          case Toolkit::Control::Left:

           {
             if ( iter == focusableActors.begin() )
             {
           {
             if ( iter == focusableActors.begin() )
             {


@@ -957,7 +957,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::K
             }
             break;
           }
             }
             break;
           }

-          case Control::Right:
+          case Toolkit::Control::Right:

           {
             if ( iter == focusableActors.end() - 1 )
             {
           {
             if ( iter == focusableActors.end() - 1 )
             {


@@ -970,7 +970,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::K
             break;
           }
 
             break;
           }
 

-          case Control::Up:
+          case Toolkit::Control::Up:

           {
             if ( *iter == mContent )
             {
           {
             if ( *iter == mContent )
             {


@@ -997,7 +997,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::K
             break;
           }
 
             break;
           }
 

-          case Control::Down:
+          case Toolkit::Control::Down:

           {
             if ( mContent && mContent.IsKeyboardFocusable() )
             {
           {
             if ( mContent && mContent.IsKeyboardFocusable() )
             {

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.h b/base/dali-toolkit/internal/controls/popup/popup-impl.h
index 747df4c..63ddb1a 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -43,7 +43,7 @@ typedef IntrusivePtr<PopupStyle> PopupStylePtr;
 /**
  * @copydoc Toolkit::Popup
  */
 /**
  * @copydoc Toolkit::Popup
  */

-class Popup : public ControlImpl
+class Popup : public Control

 {
 public:
 
 {
 public:
 


@@ -240,18 +240,18 @@ private:
   virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
 
   /**
   virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
 
   /**

-   * From ControlImpl; called after a child has been added to the owning actor.
+   * From Control; called after a child has been added to the owning actor.

    * @param[in] child The child which has been added.
    */
   virtual void OnControlChildAdd( Actor& child );
 
   /**
    * @param[in] child The child which has been added.
    */
   virtual void OnControlChildAdd( Actor& child );
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()

    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnKeyEvent()
+   * @copydoc Control::OnKeyEvent()

    */
   virtual bool OnKeyEvent(const KeyEvent& event);
 
    */
   virtual bool OnKeyEvent(const KeyEvent& event);
 


@@ -273,7 +273,7 @@ private:
   /**
    * @copydoc Control::GetNextKeyboardFocusableActor()
    */
   /**
    * @copydoc Control::GetNextKeyboardFocusableActor()
    */

-  Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);

 
 private:
 
 
 private:
 

diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
index 84b79d1..e76632b 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
+++ b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
@@ -129,7 +129,7 @@ void SetIfNotZero( Vector2& target, const Vector2& source )
  */
 void FindControls( Actor actor, ControlStack& controls, Vector2 size )
 {
  */
 void FindControls( Actor actor, ControlStack& controls, Vector2 size )
 {

-  Control control( Control::DownCast( actor ) );
+  Toolkit::Control control( Toolkit::Control::DownCast( actor ) );

   if( control )
   {
     // If the control size has been set by the application / control, then we should try and honour that.
   if( control )
   {
     // If the control size has been set by the application / control, then we should try and honour that.


@@ -195,7 +195,7 @@ void RelayoutControllerImpl::Relayout()
   while ( !controlStack.empty() )
   {
     ControlSizePair pair ( controlStack.top() );
   while ( !controlStack.empty() )
   {
     ControlSizePair pair ( controlStack.top() );

-    Control control ( pair.first );
+    Toolkit::Control control ( pair.first );

     Vector2 size ( pair.second );
     controlStack.pop();
 
     Vector2 size ( pair.second );
     controlStack.pop();
 

diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index db26273..0b4c344 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -152,7 +152,7 @@ public:
   */
  static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
   */
  static Property::Value GetProperty( BaseObject* object, Property::Index index );
 

-private: // from ControlImpl
+private: // from Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize
 
   /**
    * @copydoc Toolkit::Control::OnInitialize

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 98577b4..ea5341f 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -1399,7 +1399,7 @@ bool ItemView::OnAccessibilityPan(PanGesture gesture)
   return true;
 }
 
   return true;
 }
 

-Actor ItemView::GetNextKeyboardFocusableActor(Actor actor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
+Actor ItemView::GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)

 {
   Actor nextFocusActor;
   if(mActiveLayout)
 {
   Actor nextFocusActor;
   if(mActiveLayout)

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index 5bdc060..c995f13 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@ -341,7 +341,7 @@ private: // From CustomActorImpl
    */
   virtual bool OnMouseWheelEvent(const MouseWheelEvent& event);
 
    */
   virtual bool OnMouseWheelEvent(const MouseWheelEvent& event);
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()


@@ -356,7 +356,7 @@ private: // From ControlImpl
   /**
    * @copydoc Toolkit::Control::GetNextKeyboardFocusableActor()
    */
   /**
    * @copydoc Toolkit::Control::GetNextKeyboardFocusableActor()
    */

-  virtual Actor GetNextKeyboardFocusableActor(Actor actor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);

 
   /**
    * @copydoc Toolkit::Control::OnKeyboardFocusChangeCommitted()
 
   /**
    * @copydoc Toolkit::Control::OnKeyboardFocusChangeCommitted()

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index a18a6e2..860878f 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -495,7 +495,7 @@ private: // private overriden functions from CustomActorImpl and Controls
   virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
 
   /**
   virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
 
   /**

-   * @copydoc Dali::ControlImpl::OnControlSizeSet(const Vector3&)
+   * @copydoc Dali::Control::OnControlSizeSet(const Vector3&)

    */
   virtual void OnControlSizeSet( const Vector3& size );
 
    */
   virtual void OnControlSizeSet( const Vector3& size );
 

diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index df782be..451895c 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -61,7 +61,7 @@ const Vector4     Scrollable::DEFAULT_OVERSHOOT_COLOUR(0.0f, 0.64f, 0.85f, 0.6f)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 Scrollable::Scrollable()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 Scrollable::Scrollable()

-: ControlImpl(true/*requires touch*/),
+: Control(true/*requires touch*/),

   mPropertyRelativePosition(Property::INVALID_INDEX),
   mPropertyPositionMin(Property::INVALID_INDEX),
   mPropertyPositionMax(Property::INVALID_INDEX),
   mPropertyRelativePosition(Property::INVALID_INDEX),
   mPropertyPositionMin(Property::INVALID_INDEX),
   mPropertyPositionMax(Property::INVALID_INDEX),

diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index 05c9a75..e5af516 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -39,7 +39,7 @@ typedef IntrusivePtr<Scrollable> ScrollablePtr;
 /**
  * @copydoc Toolkit::Scrollable
  */
 /**
  * @copydoc Toolkit::Scrollable
  */

-class Scrollable : public ControlImpl
+class Scrollable : public Control

 {
 public:
   static const std::string SCROLLABLE_CAN_SCROLL_VERTICAL;
 {
 public:
   static const std::string SCROLLABLE_CAN_SCROLL_VERTICAL;

diff --git a/base/dali-toolkit/internal/controls/style-change-processor.cpp b/base/dali-toolkit/internal/controls/style-change-processor.cpp
index 4d0996c..46f940e 100644 (file)
--- a/base/dali-toolkit/internal/controls/style-change-processor.cpp
+++ b/base/dali-toolkit/internal/controls/style-change-processor.cpp
@@ -39,7 +39,7 @@ StyleChangeProcessor::~StyleChangeProcessor()
 {
 }
 
 {
 }
 

-void StyleChangeProcessor::Register( ControlImpl* control )
+void StyleChangeProcessor::Register( Control* control )

 {
   // Only create a style change processor if we have not created one in the local thread storage.
   if (!gThreadLocalStyleChangeProcessor.get())
 {
   // Only create a style change processor if we have not created one in the local thread storage.
   if (!gThreadLocalStyleChangeProcessor.get())


@@ -49,7 +49,7 @@ void StyleChangeProcessor::Register( ControlImpl* control )
 
   gThreadLocalStyleChangeProcessor->Reference();
 
 
   gThreadLocalStyleChangeProcessor->Reference();
 

-  std::vector<ControlImpl*>& controls( gThreadLocalStyleChangeProcessor->mControls );
+  std::vector<Control*>& controls( gThreadLocalStyleChangeProcessor->mControls );

 
   // Store the Control raw pointer to allow traverse all off stage controls.
   DALI_ASSERT_ALWAYS( ( std::find( controls.begin(), controls.end(), control ) == controls.end() ) && "StyleChangeProcessor::Register. The control has been registered twice." );
 
   // Store the Control raw pointer to allow traverse all off stage controls.
   DALI_ASSERT_ALWAYS( ( std::find( controls.begin(), controls.end(), control ) == controls.end() ) && "StyleChangeProcessor::Register. The control has been registered twice." );


@@ -57,15 +57,15 @@ void StyleChangeProcessor::Register( ControlImpl* control )
   controls.push_back( control );
 }
 
   controls.push_back( control );
 }
 

-void StyleChangeProcessor::Unregister( ControlImpl* control )
+void StyleChangeProcessor::Unregister( Control* control )

 {
   if (gThreadLocalStyleChangeProcessor.get())
   {
 {
   if (gThreadLocalStyleChangeProcessor.get())
   {

-    std::vector<ControlImpl*>& controls( gThreadLocalStyleChangeProcessor->mControls );
+    std::vector<Control*>& controls( gThreadLocalStyleChangeProcessor->mControls );

 
     // Removes the control from the vector as is not needed to notify it about style changes.
 
     // Removes the control from the vector as is not needed to notify it about style changes.

-    std::vector<ControlImpl*>::iterator it = std::find( controls.begin(), controls.end(), control );
-    std::vector<ControlImpl*>::iterator endIt = controls.end();
+    std::vector<Control*>::iterator it = std::find( controls.begin(), controls.end(), control );
+    std::vector<Control*>::iterator endIt = controls.end();

     DALI_ASSERT_ALWAYS( ( it != endIt ) && "StyleChangeProcessor::UnRegister. The control has not been registered in the StyleChangeProcessor." );
 
     *it = *(endIt - 1);
     DALI_ASSERT_ALWAYS( ( it != endIt ) && "StyleChangeProcessor::UnRegister. The control has not been registered in the StyleChangeProcessor." );
 
     *it = *(endIt - 1);


@@ -101,12 +101,12 @@ StyleChangeProcessor::StyleChangeProcessor()
 void StyleChangeProcessor::StyleChanged(Dali::StyleMonitor styleMonitor, StyleChange styleChange)
 {
   // Traverse all registered controls.
 void StyleChangeProcessor::StyleChanged(Dali::StyleMonitor styleMonitor, StyleChange styleChange)
 {
   // Traverse all registered controls.

-  std::vector<ControlImpl*>& controls( gThreadLocalStyleChangeProcessor->mControls );
+  std::vector<Control*>& controls( gThreadLocalStyleChangeProcessor->mControls );

 
 

-  for( std::vector<ControlImpl*>::iterator it = controls.begin(), endIt = controls.end(); it != endIt; ++it )
+  for( std::vector<Control*>::iterator it = controls.begin(), endIt = controls.end(); it != endIt; ++it )

   {
     // Create a valid handle.
   {
     // Create a valid handle.

-    IntrusivePtr<ControlImpl> implementation( *it );
+    IntrusivePtr<Control> implementation( *it );

 
     if (implementation)
     {
 
     if (implementation)
     {

diff --git a/base/dali-toolkit/internal/controls/style-change-processor.h b/base/dali-toolkit/internal/controls/style-change-processor.h
index eca3a03..062bd5e 100644 (file)
--- a/base/dali-toolkit/internal/controls/style-change-processor.h
+++ b/base/dali-toolkit/internal/controls/style-change-processor.h
@@ -26,11 +26,11 @@ namespace Dali
 namespace Toolkit
 {
 
 namespace Toolkit
 {
 

-class ControlImpl;
-

 namespace Internal
 {
 
 namespace Internal
 {
 

+class Control;
+

 /**
  * This observes and processes when any style changes occur.  When they do occur, it traverses through
  * all registered controls and calls the StyleChanged method.
 /**
  * This observes and processes when any style changes occur.  When they do occur, it traverses through
  * all registered controls and calls the StyleChanged method.


@@ -54,13 +54,13 @@ public:
    * Registers a control with the StyleChangeProcessor.
    * @param[in] control The raw Control pointer.
    */
    * Registers a control with the StyleChangeProcessor.
    * @param[in] control The raw Control pointer.
    */

-  static void Register( ControlImpl* control );
+  static void Register( Control* control );

 
   /**
    * Unregisters a control from the StyleChangeProcessor.
    * @param[in] control The raw Control pointer.
    */
 
   /**
    * Unregisters a control from the StyleChangeProcessor.
    * @param[in] control The raw Control pointer.
    */

-  static void Unregister( ControlImpl* control );
+  static void Unregister( Control* control );

 
 public:
 
 
 public:
 


@@ -112,8 +112,8 @@ private:
 
 private:
 
 
 private:
 

-  unsigned int              mCount;        ///< The reference count
-  std::vector<ControlImpl*> mControls;     ///< Stores all registered controls.
+  unsigned int          mCount;        ///< The reference count
+  std::vector<Control*> mControls;     ///< Stores all registered controls.

 };
 
 } // namespace Internal
 };
 
 } // namespace Internal

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..e2970cc 100644 (file)
--- 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 )
 }
 
 TableView::TableView( unsigned int initialRows, unsigned int initialColumns )

-: ControlImpl( true ),  // requires touch
+: Control( true ),  // requires touch

   mCellData( initialRows, initialColumns ),
   mLayoutingChild( false ),
   mConstraintDuration( DEFAULT_CONSTRAINT_DURATION )
   mCellData( initialRows, initialColumns ),
   mLayoutingChild( false ),
   mConstraintDuration( DEFAULT_CONSTRAINT_DURATION )


@@ -1000,7 +1000,7 @@ TableView::~TableView()
   // nothing to do
 }
 
   // 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;
 
 {
   Actor nextFocusableActor;
 


@@ -1023,7 +1023,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
 
       switch ( direction )
       {
 
       switch ( direction )
       {

-        case Control::Left:
+        case Toolkit::Control::Left:

         {
           if(--currentColumn < 0)
           {
         {
           if(--currentColumn < 0)
           {


@@ -1036,7 +1036,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
           }
           break;
         }
           }
           break;
         }

-        case Control::Right:
+        case Toolkit::Control::Right:

         {
           if(++currentColumn > numberOfColumns - 1)
           {
         {
           if(++currentColumn > numberOfColumns - 1)
           {


@@ -1049,7 +1049,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
           }
           break;
         }
           }
           break;
         }

-        case Control::Up:
+        case Toolkit::Control::Up:

         {
           if(--currentRow < 0)
           {
         {
           if(--currentRow < 0)
           {


@@ -1058,7 +1058,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
           }
           break;
         }
           }
           break;
         }

-        case Control::Down:
+        case Toolkit::Control::Down:

         {
           if(++currentRow > numberOfRows - 1)
           {
         {
           if(++currentRow > numberOfRows - 1)
           {

diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.h b/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
index 5f7a5d1..c4c4349 100644 (file)
--- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
@@ -35,7 +35,7 @@ namespace Internal
  * TableView is a custom control for laying out actors in a table layout
  * @see Dali::Toolkit:TableView for more details
  */
  * TableView is a custom control for laying out actors in a table layout
  * @see Dali::Toolkit:TableView for more details
  */

-class TableView : public ControlImpl
+class TableView : public Control

 {
 public:
 
 {
 public:
 


@@ -186,32 +186,32 @@ public:
    */
   unsigned int GetColumns();
 
    */
   unsigned int GetColumns();
 

-private: // From ControlImpl
+private: // From Control

 
   /**
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnControlChildAdd(Actor& child)
+   * @copydoc Control::OnControlChildAdd(Actor& child)

    */
   virtual void OnControlChildAdd(Actor& child);
 
   /**
    */
   virtual void OnControlChildAdd(Actor& child);
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnControlChildRemove(Actor& child)
+   * @copydoc Control::OnControlChildRemove(Actor& child)

    */
   virtual void OnControlChildRemove(Actor& child);
 
   /**
    */
   virtual void OnControlChildRemove(Actor& child);
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnRelaidOut
+   * @copydoc Control::OnRelaidOut

    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnInitialize()
+   * @copydoc Control::OnInitialize()

    */
   virtual void OnInitialize();
 
   /**
    */
   virtual void OnInitialize();
 
   /**

-   * @copydoc Toolkit::ControlImpl::GetNextKeyboardFocusableActor
+   * @copydoc Control::GetNextKeyboardFocusableActor

    */
    */

-  virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);

 
 private: // Implementation
 
 
 private: // Implementation
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 5ce0daf..e9de775 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -269,7 +269,7 @@ Dali::Toolkit::TextInput TextInput::New()
 }
 
 TextInput::TextInput()
 }
 
 TextInput::TextInput()

-:ControlImpl( true ),
+:Control( true ),

  mState( StateEdit ),
  mStyledText(),
  mInputStyle(),
  mState( StateEdit ),
  mStyledText(),
  mInputStyle(),


@@ -2037,7 +2037,7 @@ void TextInput::CreateTextViewActor()
   mDisplayedTextView.SetLineJustification( Toolkit::TextView::Left );
   mDisplayedTextView.SetTextAlignment( static_cast<Toolkit::Alignment::Type>( Toolkit::Alignment::HorizontalLeft | Toolkit::Alignment::VerticalTop ) );
   mDisplayedTextView.SetPosition( Vector3( 0.0f, 0.0f, DISPLAYED_TEXT_VIEW_Z_OFFSET ) );
   mDisplayedTextView.SetLineJustification( Toolkit::TextView::Left );
   mDisplayedTextView.SetTextAlignment( static_cast<Toolkit::Alignment::Type>( Toolkit::Alignment::HorizontalLeft | Toolkit::Alignment::VerticalTop ) );
   mDisplayedTextView.SetPosition( Vector3( 0.0f, 0.0f, DISPLAYED_TEXT_VIEW_Z_OFFSET ) );

-  mDisplayedTextView.SetSizePolicy( Control::Fixed, Control::Fixed );
+  mDisplayedTextView.SetSizePolicy( Toolkit::Control::Fixed, Toolkit::Control::Fixed );

 
   mDisplayedTextView.ScrolledSignal().Connect( this, &TextInput::OnTextViewScrolled );
 
 
   mDisplayedTextView.ScrolledSignal().Connect( this, &TextInput::OnTextViewScrolled );
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
index 44378ac..1712d2e 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
@@ -42,7 +42,7 @@ class TextView;
 
 typedef IntrusivePtr<TextInput> TextInputPtr;
 
 
 typedef IntrusivePtr<TextInput> TextInputPtr;
 

-class TextInput : public ControlImpl
+class TextInput : public Control

 {
 public:
 
 {
 public:
 


@@ -520,11 +520,11 @@ private:
   virtual void OnKeyInputFocusLost();
 
   /**
   virtual void OnKeyInputFocusLost();
 
   /**

-   * From ControlImpl; called whenever the control is added to the stage.
+   * From Control; called whenever the control is added to the stage.

    */
   virtual void OnControlStageConnection();
 
    */
   virtual void OnControlStageConnection();
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * Creation of the layer that is used by top level active parts of the TextInput like handles
 
   /**
    * Creation of the layer that is used by top level active parts of the TextInput like handles


@@ -532,17 +532,17 @@ private: // From ControlImpl
   void CreateActiveLayer();
 
   /**
   void CreateActiveLayer();
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnInitialize()
+   * @copydoc Control::OnInitialize()

    */
   virtual void OnInitialize();
 
   /**
    */
   virtual void OnInitialize();
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnControlSizeSet()
+   * @copydoc Control::OnControlSizeSet()

    */
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**
    */
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()

    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
index 426357d..31c3ba0 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
@@ -1010,7 +1010,7 @@ TextView::RelayoutData& TextView::RelayoutData::operator=( const TextView::Relay
 }
 
 TextView::TextView()
 }
 
 TextView::TextView()

-: ControlImpl( false ),  // doesn't require touch events
+: Control( false ),  // doesn't require touch events

   mCurrentStyledText(),
   mTextViewProcessorOperations(),
   mLayoutParameters( Toolkit::TextView::SplitByNewLineChar,
   mCurrentStyledText(),
   mTextViewProcessorOperations(),
   mLayoutParameters( Toolkit::TextView::SplitByNewLineChar,

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
index d723d8d..7ac5246 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
@@ -38,14 +38,14 @@ namespace Internal
 /**
  * TextView is a custom control for text aligning and multiline support
  */
 /**
  * TextView is a custom control for text aligning and multiline support
  */

-class TextView : public ControlImpl
+class TextView : public Control

 {
 public:
 
   // Properties
   enum
   {
 {
 public:
 
   // Properties
   enum
   {

-    TEXTVIEW_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+    TEXTVIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,

     TEXTVIEW_PROPERTY_END_INDEX = TEXTVIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 
     TEXTVIEW_PROPERTY_END_INDEX = TEXTVIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 


@@ -360,7 +360,7 @@ public:
   static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
 
   static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()

diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 1889edb..b3ade96 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -40,7 +40,7 @@ namespace // unnamed namespace
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_KEYBOARD_FOCUS_MANAGER");
 #endif
 
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_KEYBOARD_FOCUS_MANAGER");
 #endif
 

-const std::string IS_FOCUS_GROUP_PROPERTY_NAME("is-keyboard-focus-group"); // This property will be replaced by a flag in ControlImpl.
+const std::string IS_FOCUS_GROUP_PROPERTY_NAME("is-keyboard-focus-group"); // This property will be replaced by a flag in Control.

 
 const char* FOCUS_BORDER_IMAGE_PATH = DALI_IMAGE_DIR "keyboard_focus.png";
 const Vector4 FOCUS_BORDER_IMAGE_BORDER = Vector4(7.0f, 7.0f, 7.0f, 7.0f);
 
 const char* FOCUS_BORDER_IMAGE_PATH = DALI_IMAGE_DIR "keyboard_focus.png";
 const Vector4 FOCUS_BORDER_IMAGE_BORDER = Vector4(7.0f, 7.0f, 7.0f, 7.0f);

diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index 8fa9500..e3276d1 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -91,9 +91,9 @@ void KeyInputFocusManager::SetFocus(Toolkit::Control control)
   }
 }
 
   }
 }
 

-Control KeyInputFocusManager::GetCurrentFocusControl() const
+Toolkit::Control KeyInputFocusManager::GetCurrentFocusControl() const

 {
 {

-  Control currentFocusControl;
+  Toolkit::Control currentFocusControl;

 
   if(!mFocusActorsQueue.empty())
   {
 
   if(!mFocusActorsQueue.empty())
   {

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index fe4429a..9347f6a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -34,13 +34,13 @@ namespace Dali
 namespace Toolkit
 {
 
 namespace Toolkit
 {
 

-const Property::Index Control::PROPERTY_BACKGROUND_COLOR      = ControlImpl::CONTROL_PROPERTY_START_INDEX;
-const Property::Index Control::PROPERTY_BACKGROUND            = ControlImpl::CONTROL_PROPERTY_START_INDEX + 1;
-const Property::Index Control::PROPERTY_WIDTH_POLICY          = ControlImpl::CONTROL_PROPERTY_START_INDEX + 2;
-const Property::Index Control::PROPERTY_HEIGHT_POLICY         = ControlImpl::CONTROL_PROPERTY_START_INDEX + 3;
-const Property::Index Control::PROPERTY_MINIMUM_SIZE          = ControlImpl::CONTROL_PROPERTY_START_INDEX + 4;
-const Property::Index Control::PROPERTY_MAXIMUM_SIZE          = ControlImpl::CONTROL_PROPERTY_START_INDEX + 5;
-const Property::Index Control::PROPERTY_KEY_INPUT_FOCUS       = ControlImpl::CONTROL_PROPERTY_START_INDEX + 6;
+const Property::Index Control::PROPERTY_BACKGROUND_COLOR      = Internal::Control::CONTROL_PROPERTY_START_INDEX;
+const Property::Index Control::PROPERTY_BACKGROUND            = Internal::Control::CONTROL_PROPERTY_START_INDEX + 1;
+const Property::Index Control::PROPERTY_WIDTH_POLICY          = Internal::Control::CONTROL_PROPERTY_START_INDEX + 2;
+const Property::Index Control::PROPERTY_HEIGHT_POLICY         = Internal::Control::CONTROL_PROPERTY_START_INDEX + 3;
+const Property::Index Control::PROPERTY_MINIMUM_SIZE          = Internal::Control::CONTROL_PROPERTY_START_INDEX + 4;
+const Property::Index Control::PROPERTY_MAXIMUM_SIZE          = Internal::Control::CONTROL_PROPERTY_START_INDEX + 5;
+const Property::Index Control::PROPERTY_KEY_INPUT_FOCUS       = Internal::Control::CONTROL_PROPERTY_START_INDEX + 6;

 
 namespace
 {
 
 namespace
 {


@@ -64,14 +64,14 @@ const float BACKGROUND_ACTOR_Z_POSITION( -0.1f );
 
 BaseHandle Create()
 {
 
 BaseHandle Create()
 {

-  return ControlImpl::New();
+  return Internal::Control::New();

 }
 
 TypeRegistration CONTROL_TYPE( typeid(Control), typeid(CustomActor), Create );
 
 }
 
 TypeRegistration CONTROL_TYPE( typeid(Control), typeid(CustomActor), Create );
 

-// Property Registration after ControlImpl::Impl definition below
+// Property Registration after Internal::Control::Impl definition below

 
 

-TypeAction ACTION_TYPE_1(CONTROL_TYPE, Toolkit::Control::ACTION_CONTROL_ACTIVATED, &ControlImpl::DoAction);
+TypeAction ACTION_TYPE_1(CONTROL_TYPE, Toolkit::Control::ACTION_CONTROL_ACTIVATED, &Internal::Control::DoAction);

 
 /**
  * Helper class used to set the Control's size through the Actor's API or through children added.
 
 /**
  * Helper class used to set the Control's size through the Actor's API or through children added.


@@ -228,11 +228,14 @@ void SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const
 
 } // unnamed namespace
 
 
 } // unnamed namespace
 

-class ControlImpl::Impl : public ConnectionTrackerInterface
+namespace Internal
+{
+
+class Control::Impl : public ConnectionTrackerInterface

 {
 public:
   // Construction & Destruction
 {
 public:
   // Construction & Destruction

-  Impl(ControlImpl& controlImpl)
+  Impl(Control& controlImpl)

   : mControlImpl(controlImpl),
     mInitialized( false ),
     mPinchGestureDetector(),
   : mControlImpl(controlImpl),
     mInitialized( false ),
     mPinchGestureDetector(),


@@ -241,8 +244,8 @@ public:
     mLongPressGestureDetector(),
     mStartingPinchScale(),
     mLockSetSize( false ),
     mLongPressGestureDetector(),
     mStartingPinchScale(),
     mLockSetSize( false ),

-    mWidthPolicy( Control::Fixed ),
-    mHeightPolicy( Control::Fixed ),
+    mWidthPolicy( Toolkit::Control::Fixed ),
+    mHeightPolicy( Toolkit::Control::Fixed ),

     mSize(),
     mSetSize(),
     mMinimumSize(),
     mSize(),
     mSetSize(),
     mMinimumSize(),


@@ -334,21 +337,21 @@ public:
    */
   static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
   {
    */
   static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
   {

-    Control control = Control::DownCast( BaseHandle( object ) );
+    Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );

 
     if ( control )
     {
 
     if ( control )
     {

-      ControlImpl& controlImpl( control.GetImplementation() );
+      Control& controlImpl( control.GetImplementation() );

 
       switch ( index )
       {
 
       switch ( index )
       {

-        case Control::PROPERTY_BACKGROUND_COLOR:
+        case Toolkit::Control::PROPERTY_BACKGROUND_COLOR:

         {
           controlImpl.SetBackgroundColor( value.Get< Vector4 >() );
           break;
         }
 
         {
           controlImpl.SetBackgroundColor( value.Get< Vector4 >() );
           break;
         }
 

-        case Control::PROPERTY_BACKGROUND:
+        case Toolkit::Control::PROPERTY_BACKGROUND:

         {
           if ( value.HasKey( "image" ) )
           {
         {
           if ( value.HasKey( "image" ) )
           {


@@ -368,31 +371,31 @@ public:
           break;
         }
 
           break;
         }
 

-        case Control::PROPERTY_WIDTH_POLICY:
+        case Toolkit::Control::PROPERTY_WIDTH_POLICY:

         {
         {

-          controlImpl.mImpl->mWidthPolicy = Scripting::GetEnumeration< Control::SizePolicy >( value.Get< std::string >(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT );
+          controlImpl.mImpl->mWidthPolicy = Scripting::GetEnumeration< Toolkit::Control::SizePolicy >( value.Get< std::string >(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT );

           break;
         }
 
           break;
         }
 

-        case Control::PROPERTY_HEIGHT_POLICY:
+        case Toolkit::Control::PROPERTY_HEIGHT_POLICY:

         {
         {

-          controlImpl.mImpl->mHeightPolicy = Scripting::GetEnumeration< Control::SizePolicy >( value.Get< std::string >(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT );
+          controlImpl.mImpl->mHeightPolicy = Scripting::GetEnumeration< Toolkit::Control::SizePolicy >( value.Get< std::string >(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT );

           break;
         }
 
           break;
         }
 

-        case Control::PROPERTY_MINIMUM_SIZE:
+        case Toolkit::Control::PROPERTY_MINIMUM_SIZE:

         {
           controlImpl.SetMinimumSize( value.Get< Vector3 >() );
           break;
         }
 
         {
           controlImpl.SetMinimumSize( value.Get< Vector3 >() );
           break;
         }
 

-        case Control::PROPERTY_MAXIMUM_SIZE:
+        case Toolkit::Control::PROPERTY_MAXIMUM_SIZE:

         {
           controlImpl.SetMaximumSize( value.Get< Vector3 >() );
           break;
         }
 
         {
           controlImpl.SetMaximumSize( value.Get< Vector3 >() );
           break;
         }
 

-        case Control::PROPERTY_KEY_INPUT_FOCUS:
+        case Toolkit::Control::PROPERTY_KEY_INPUT_FOCUS:

         {
           if ( value.Get< bool >() )
           {
         {
           if ( value.Get< bool >() )
           {


@@ -418,21 +421,21 @@ public:
   {
     Property::Value value;
 
   {
     Property::Value value;
 

-    Control control = Control::DownCast( BaseHandle( object ) );
+    Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );

 
     if ( control )
     {
 
     if ( control )
     {

-      ControlImpl& controlImpl( control.GetImplementation() );
+      Control& controlImpl( control.GetImplementation() );

 
       switch ( index )
       {
 
       switch ( index )
       {

-        case Control::PROPERTY_BACKGROUND_COLOR:
+        case Toolkit::Control::PROPERTY_BACKGROUND_COLOR:

         {
           value = controlImpl.GetBackgroundColor();
           break;
         }
 
         {
           value = controlImpl.GetBackgroundColor();
           break;
         }
 

-        case Control::PROPERTY_BACKGROUND:
+        case Toolkit::Control::PROPERTY_BACKGROUND:

         {
           Property::Map map;
 
         {
           Property::Map map;
 


@@ -453,31 +456,31 @@ public:
           break;
         }
 
           break;
         }
 

-        case Control::PROPERTY_WIDTH_POLICY:
+        case Toolkit::Control::PROPERTY_WIDTH_POLICY:

         {
         {

-          value = std::string( Scripting::GetEnumerationName< Control::SizePolicy >( controlImpl.mImpl->mWidthPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) );
+          value = std::string( Scripting::GetEnumerationName< Toolkit::Control::SizePolicy >( controlImpl.mImpl->mWidthPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) );

           break;
         }
 
           break;
         }
 

-        case Control::PROPERTY_HEIGHT_POLICY:
+        case Toolkit::Control::PROPERTY_HEIGHT_POLICY:

         {
         {

-          value = std::string( Scripting::GetEnumerationName< Control::SizePolicy >( controlImpl.mImpl->mHeightPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) );
+          value = std::string( Scripting::GetEnumerationName< Toolkit::Control::SizePolicy >( controlImpl.mImpl->mHeightPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) );

           break;
         }
 
           break;
         }
 

-        case Control::PROPERTY_MINIMUM_SIZE:
+        case Toolkit::Control::PROPERTY_MINIMUM_SIZE:

         {
           value = controlImpl.mImpl->mMinimumSize;
           break;
         }
 
         {
           value = controlImpl.mImpl->mMinimumSize;
           break;
         }
 

-        case Control::PROPERTY_MAXIMUM_SIZE:
+        case Toolkit::Control::PROPERTY_MAXIMUM_SIZE:

         {
           value = controlImpl.mImpl->mMaximumSize;
           break;
         }
 
         {
           value = controlImpl.mImpl->mMaximumSize;
           break;
         }
 

-        case Control::PROPERTY_KEY_INPUT_FOCUS:
+        case Toolkit::Control::PROPERTY_KEY_INPUT_FOCUS:

         {
           value = controlImpl.HasKeyInputFocus();
           break;
         {
           value = controlImpl.HasKeyInputFocus();
           break;


@@ -490,7 +493,7 @@ public:
 
   // Data
 
 
   // Data
 

-  ControlImpl& mControlImpl;
+  Control& mControlImpl;

 
   bool mInitialized:1;
 
 
   bool mInitialized:1;
 


@@ -509,8 +512,8 @@ public:
 
   bool mLockSetSize;                 ///< Used to avoid. Can't be a bitfield as a reference to this member is used in SetSizeLock helper class.
 
 
   bool mLockSetSize;                 ///< Used to avoid. Can't be a bitfield as a reference to this member is used in SetSizeLock helper class.
 

-  Control::SizePolicy mWidthPolicy;  ///< Stores the width policy.
-  Control::SizePolicy mHeightPolicy; ///< Stores the height policy.
+  Toolkit::Control::SizePolicy mWidthPolicy;  ///< Stores the width policy.
+  Toolkit::Control::SizePolicy mHeightPolicy; ///< Stores the height policy.

 
   Vector3 mSize;                     ///< Stores the current control's size.
   Vector3 mSetSize;                  ///< Always stores the size set through the Actor's API. Useful when reset to the initial size is needed.
 
   Vector3 mSize;                     ///< Stores the current control's size.
   Vector3 mSetSize;                  ///< Always stores the size set through the Actor's API. Useful when reset to the initial size is needed.


@@ -525,7 +528,7 @@ public:
   // Background
   Background* mBackground;           ///< Only create the background if we use it
 
   // Background
   Background* mBackground;           ///< Only create the background if we use it
 

-  // Properties - these need to be members of ControlImpl::Impl as they need to functions within this class.
+  // Properties - these need to be members of Internal::Control::Impl as they need to functions within this class.

   static PropertyRegistration PROPERTY_1;
   static PropertyRegistration PROPERTY_2;
   static PropertyRegistration PROPERTY_3;
   static PropertyRegistration PROPERTY_1;
   static PropertyRegistration PROPERTY_2;
   static PropertyRegistration PROPERTY_3;


@@ -535,21 +538,21 @@ public:
   static PropertyRegistration PROPERTY_7;
 };
 
   static PropertyRegistration PROPERTY_7;
 };
 

-PropertyRegistration ControlImpl::Impl::PROPERTY_1( CONTROL_TYPE, "background-color", Control::PROPERTY_BACKGROUND_COLOR, Property::VECTOR4, &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_2( CONTROL_TYPE, "background",       Control::PROPERTY_BACKGROUND,       Property::MAP,     &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_3( CONTROL_TYPE, "width-policy",     Control::PROPERTY_WIDTH_POLICY,     Property::STRING,  &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_4( CONTROL_TYPE, "height-policy",    Control::PROPERTY_HEIGHT_POLICY,    Property::STRING,  &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_5( CONTROL_TYPE, "minimum-size",     Control::PROPERTY_MINIMUM_SIZE,     Property::VECTOR3, &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_6( CONTROL_TYPE, "maximum-size",     Control::PROPERTY_MAXIMUM_SIZE,     Property::VECTOR3, &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_7( CONTROL_TYPE, "key-input-focus",  Control::PROPERTY_KEY_INPUT_FOCUS,  Property::BOOLEAN, &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_1( CONTROL_TYPE, "background-color", Toolkit::Control::PROPERTY_BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_2( CONTROL_TYPE, "background",       Toolkit::Control::PROPERTY_BACKGROUND,       Property::MAP,     &Control::Impl::SetProperty, &Control::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_3( CONTROL_TYPE, "width-policy",     Toolkit::Control::PROPERTY_WIDTH_POLICY,     Property::STRING,  &Control::Impl::SetProperty, &Control::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_4( CONTROL_TYPE, "height-policy",    Toolkit::Control::PROPERTY_HEIGHT_POLICY,    Property::STRING,  &Control::Impl::SetProperty, &Control::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_5( CONTROL_TYPE, "minimum-size",     Toolkit::Control::PROPERTY_MINIMUM_SIZE,     Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_6( CONTROL_TYPE, "maximum-size",     Toolkit::Control::PROPERTY_MAXIMUM_SIZE,     Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
+PropertyRegistration Control::Impl::PROPERTY_7( CONTROL_TYPE, "key-input-focus",  Toolkit::Control::PROPERTY_KEY_INPUT_FOCUS,  Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty );

 
 

-Control ControlImpl::New()
+Toolkit::Control Control::New()

 {
   // Create the implementation, temporarily owned on stack
 {
   // Create the implementation, temporarily owned on stack

-  IntrusivePtr<ControlImpl> controlImpl = new ControlImpl( false );
+  IntrusivePtr<Control> controlImpl = new Control( false );

 
   // Pass ownership to handle
 
   // Pass ownership to handle

-  Control handle( *controlImpl );
+  Toolkit::Control handle( *controlImpl );

 
   // Second-phase init of the implementation
   // This can only be done after the CustomActor connection has been made...
 
   // Second-phase init of the implementation
   // This can only be done after the CustomActor connection has been made...


@@ -558,7 +561,7 @@ Control ControlImpl::New()
   return handle;
 }
 
   return handle;
 }
 

-ControlImpl::~ControlImpl()
+Control::~Control()

 {
   if( mImpl->mInitialized )
   {
 {
   if( mImpl->mInitialized )
   {


@@ -568,7 +571,7 @@ ControlImpl::~ControlImpl()
   delete mImpl;
 }
 
   delete mImpl;
 }
 

-void ControlImpl::Initialize()
+void Control::Initialize()

 {
   // Register with the style change processor so we are informed when the default style changes
   Internal::StyleChangeProcessor::Register( this );
 {
   // Register with the style change processor so we are informed when the default style changes
   Internal::StyleChangeProcessor::Register( this );


@@ -579,7 +582,7 @@ void ControlImpl::Initialize()
   mImpl->mInitialized = true;
 }
 
   mImpl->mInitialized = true;
 }
 

-void ControlImpl::EnableGestureDetection(Gesture::Type type)
+void Control::EnableGestureDetection(Gesture::Type type)

 {
   if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector )
   {
 {
   if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector )
   {


@@ -610,7 +613,7 @@ void ControlImpl::EnableGestureDetection(Gesture::Type type)
   }
 }
 
   }
 }
 

-void ControlImpl::DisableGestureDetection(Gesture::Type type)
+void Control::DisableGestureDetection(Gesture::Type type)

 {
   if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector )
   {
 {
   if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector )
   {


@@ -637,27 +640,27 @@ void ControlImpl::DisableGestureDetection(Gesture::Type type)
   }
 }
 
   }
 }
 

-PinchGestureDetector ControlImpl::GetPinchGestureDetector() const
+PinchGestureDetector Control::GetPinchGestureDetector() const

 {
   return mImpl->mPinchGestureDetector;
 }
 
 {
   return mImpl->mPinchGestureDetector;
 }
 

-PanGestureDetector ControlImpl::GetPanGestureDetector() const
+PanGestureDetector Control::GetPanGestureDetector() const

 {
   return mImpl->mPanGestureDetector;
 }
 
 {
   return mImpl->mPanGestureDetector;
 }
 

-TapGestureDetector ControlImpl::GetTapGestureDetector() const
+TapGestureDetector Control::GetTapGestureDetector() const

 {
   return mImpl->mTapGestureDetector;
 }
 
 {
   return mImpl->mTapGestureDetector;
 }
 

-LongPressGestureDetector ControlImpl::GetLongPressGestureDetector() const
+LongPressGestureDetector Control::GetLongPressGestureDetector() const

 {
   return mImpl->mLongPressGestureDetector;
 }
 
 {
   return mImpl->mLongPressGestureDetector;
 }
 

-void ControlImpl::SetBackgroundColor( const Vector4& color )
+void Control::SetBackgroundColor( const Vector4& color )

 {
   Background& background( mImpl->GetBackground() );
 
 {
   Background& background( mImpl->GetBackground() );
 


@@ -682,7 +685,7 @@ void ControlImpl::SetBackgroundColor( const Vector4& color )
   background.color = color;
 }
 
   background.color = color;
 }
 

-Vector4 ControlImpl::GetBackgroundColor() const
+Vector4 Control::GetBackgroundColor() const

 {
   if ( mImpl->mBackground )
   {
 {
   if ( mImpl->mBackground )
   {


@@ -691,7 +694,7 @@ Vector4 ControlImpl::GetBackgroundColor() const
   return Color::TRANSPARENT;
 }
 
   return Color::TRANSPARENT;
 }
 

-void ControlImpl::SetBackground( Image image )
+void Control::SetBackground( Image image )

 {
   Background& background( mImpl->GetBackground() );
 
 {
   Background& background( mImpl->GetBackground() );
 


@@ -710,7 +713,7 @@ void ControlImpl::SetBackground( Image image )
   Self().Add( imageActor );
 }
 
   Self().Add( imageActor );
 }
 

-void ControlImpl::ClearBackground()
+void Control::ClearBackground()

 {
   if ( mImpl->mBackground )
   {
 {
   if ( mImpl->mBackground )
   {


@@ -722,7 +725,7 @@ void ControlImpl::ClearBackground()
   }
 }
 
   }
 }
 

-Actor ControlImpl::GetBackgroundActor() const
+Actor Control::GetBackgroundActor() const

 {
   if ( mImpl->mBackground )
   {
 {
   if ( mImpl->mBackground )
   {


@@ -732,7 +735,7 @@ Actor ControlImpl::GetBackgroundActor() const
   return Actor();
 }
 
   return Actor();
 }
 

-void ControlImpl::OnPinch(PinchGesture pinch)
+void Control::OnPinch(PinchGesture pinch)

 {
   if (pinch.state == Gesture::Started)
   {
 {
   if (pinch.state == Gesture::Started)
   {


@@ -742,7 +745,7 @@ void ControlImpl::OnPinch(PinchGesture pinch)
   Self().SetScale(mImpl->mStartingPinchScale * pinch.scale);
 }
 
   Self().SetScale(mImpl->mStartingPinchScale * pinch.scale);
 }
 

-void ControlImpl::OnStageConnection()
+void Control::OnStageConnection()

 {
   RelayoutRequest();
 
 {
   RelayoutRequest();
 


@@ -750,13 +753,13 @@ void ControlImpl::OnStageConnection()
   OnControlStageConnection();
 }
 
   OnControlStageConnection();
 }
 

-void ControlImpl::OnStageDisconnection()
+void Control::OnStageDisconnection()

 {
   // Notify derived classes
   OnControlStageDisconnection();
 }
 
 {
   // Notify derived classes
   OnControlStageDisconnection();
 }
 

-void ControlImpl::OnChildAdd(Actor& child)
+void Control::OnChildAdd(Actor& child)

 {
   // If this is the background actor, then we do not want to relayout or inform deriving classes
   if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) )
 {
   // If this is the background actor, then we do not want to relayout or inform deriving classes
   if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) )


@@ -771,7 +774,7 @@ void ControlImpl::OnChildAdd(Actor& child)
   OnControlChildAdd( child );
 }
 
   OnControlChildAdd( child );
 }
 

-void ControlImpl::OnChildRemove(Actor& child)
+void Control::OnChildRemove(Actor& child)

 {
   // If this is the background actor, then we do not want to relayout or inform deriving classes
   if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) )
 {
   // If this is the background actor, then we do not want to relayout or inform deriving classes
   if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) )


@@ -786,7 +789,7 @@ void ControlImpl::OnChildRemove(Actor& child)
   OnControlChildRemove( child );
 }
 
   OnControlChildRemove( child );
 }
 

-void ControlImpl::OnSizeSet(const Vector3& targetSize)
+void Control::OnSizeSet(const Vector3& targetSize)

 {
   if( ( !mImpl->mLockSetSize ) && ( targetSize != mImpl->mSetSize ) )
   {
 {
   if( ( !mImpl->mLockSetSize ) && ( targetSize != mImpl->mSetSize ) )
   {


@@ -804,98 +807,98 @@ void ControlImpl::OnSizeSet(const Vector3& targetSize)
   }
 }
 
   }
 }
 

-void ControlImpl::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
+void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize)

 {
   // Do Nothing
 }
 
 {
   // Do Nothing
 }
 

-bool ControlImpl::OnTouchEvent(const TouchEvent& event)
+bool Control::OnTouchEvent(const TouchEvent& event)

 {
   return false; // Do not consume
 }
 
 {
   return false; // Do not consume
 }
 

-bool ControlImpl::OnKeyEvent(const KeyEvent& event)
+bool Control::OnKeyEvent(const KeyEvent& event)

 {
   return false; // Do not consume
 }
 
 {
   return false; // Do not consume
 }
 

-bool ControlImpl::OnMouseWheelEvent(const MouseWheelEvent& event)
+bool Control::OnMouseWheelEvent(const MouseWheelEvent& event)

 {
   return false; // Do not consume
 }
 
 {
   return false; // Do not consume
 }
 

-void ControlImpl::OnKeyInputFocusGained()
+void Control::OnKeyInputFocusGained()

 {
   // Do Nothing
 }
 
 {
   // Do Nothing
 }
 

-void ControlImpl::OnKeyInputFocusLost()
+void Control::OnKeyInputFocusLost()

 {
   // Do Nothing
 }
 
 {
   // Do Nothing
 }
 

-Actor ControlImpl::GetChildByAlias(const std::string& actorAlias)
+Actor Control::GetChildByAlias(const std::string& actorAlias)

 {
   return Actor();
 }
 
 {
   return Actor();
 }
 

-bool ControlImpl::OnAccessibilityPan(PanGesture gesture)
+bool Control::OnAccessibilityPan(PanGesture gesture)

 {
   return false; // Accessibility pan gesture is not handled by default
 }
 
 {
   return false; // Accessibility pan gesture is not handled by default
 }
 

-bool ControlImpl::OnAccessibilityValueChange(bool isIncrease)
+bool Control::OnAccessibilityValueChange(bool isIncrease)

 {
   return false; // Accessibility value change action is not handled by default
 }
 
 
 {
   return false; // Accessibility value change action is not handled by default
 }
 
 

-void ControlImpl::SetKeyboardNavigationSupport(bool isSupported)
+void Control::SetKeyboardNavigationSupport(bool isSupported)

 {
   mImpl->mIsKeyboardNavigationSupported = isSupported;
 }
 
 {
   mImpl->mIsKeyboardNavigationSupported = isSupported;
 }
 

-bool ControlImpl::IsKeyboardNavigationSupported()
+bool Control::IsKeyboardNavigationSupported()

 {
   return mImpl->mIsKeyboardNavigationSupported;
 }
 
 {
   return mImpl->mIsKeyboardNavigationSupported;
 }
 

-void ControlImpl::SetAsKeyboardFocusGroup(bool isFocusGroup)
+void Control::SetAsKeyboardFocusGroup(bool isFocusGroup)

 {
   mImpl->mIsKeyboardFocusGroup = isFocusGroup;
 
   // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted
 {
   mImpl->mIsKeyboardFocusGroup = isFocusGroup;
 
   // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted

-  KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup);
+  Toolkit::KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup);

 }
 
 }
 

-bool ControlImpl::IsKeyboardFocusGroup()
+bool Control::IsKeyboardFocusGroup()

 {
 {

-  return KeyboardFocusManager::Get().IsFocusGroup(Self());
+  return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self());

 }
 
 }
 

-Actor ControlImpl::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
+Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)

 {
   return Actor();
 }
 
 {
   return Actor();
 }
 

-bool ControlImpl::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+bool Control::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)

 {
   bool ret = false;
 
   return ret;
 }
 
 {
   bool ret = false;
 
   return ret;
 }
 

-void ControlImpl::DoActivatedAction(const PropertyValueContainer& attributes)
+void Control::DoActivatedAction(const PropertyValueContainer& attributes)

 {
   OnActivated();
 }
 
 {
   OnActivated();
 }
 

-Toolkit::Control::KeyEventSignalV2& ControlImpl::KeyEventSignal()
+Toolkit::Control::KeyEventSignalV2& Control::KeyEventSignal()

 {
   return mImpl->mKeyEventSignalV2;
 }
 
 {
   return mImpl->mKeyEventSignalV2;
 }
 

-void ControlImpl::SetSizePolicy( Control::SizePolicy widthPolicy, Control::SizePolicy heightPolicy )
+void Control::SetSizePolicy( Toolkit::Control::SizePolicy widthPolicy, Toolkit::Control::SizePolicy heightPolicy )

 {
   bool relayoutRequest( false );
 
 {
   bool relayoutRequest( false );
 


@@ -914,59 +917,59 @@ void ControlImpl::SetSizePolicy( Control::SizePolicy widthPolicy, Control::SizeP
   }
 }
 
   }
 }
 

-void ControlImpl::GetSizePolicy( Control::SizePolicy& widthPolicy, Control::SizePolicy& heightPolicy ) const
+void Control::GetSizePolicy( Toolkit::Control::SizePolicy& widthPolicy, Toolkit::Control::SizePolicy& heightPolicy ) const

 {
   widthPolicy = mImpl->mWidthPolicy;
   heightPolicy = mImpl->mHeightPolicy;
 }
 
 {
   widthPolicy = mImpl->mWidthPolicy;
   heightPolicy = mImpl->mHeightPolicy;
 }
 

-void ControlImpl::SetMinimumSize( const Vector3& size )
+void Control::SetMinimumSize( const Vector3& size )

 {
   if ( mImpl->mMinimumSize != size )
   {
     mImpl->mMinimumSize = size;
 
     // Only relayout if our control is using the minimum or range policy.
 {
   if ( mImpl->mMinimumSize != size )
   {
     mImpl->mMinimumSize = size;
 
     // Only relayout if our control is using the minimum or range policy.

-    if ( ( mImpl->mHeightPolicy == Control::Minimum ) || ( mImpl->mWidthPolicy  == Control::Minimum ) ||
-         ( mImpl->mHeightPolicy == Control::Range   ) || ( mImpl->mWidthPolicy  == Control::Range   ) )
+    if ( ( mImpl->mHeightPolicy == Toolkit::Control::Minimum ) || ( mImpl->mWidthPolicy  == Toolkit::Control::Minimum ) ||
+         ( mImpl->mHeightPolicy == Toolkit::Control::Range   ) || ( mImpl->mWidthPolicy  == Toolkit::Control::Range   ) )

     {
       RelayoutRequest();
     }
   }
 }
 
     {
       RelayoutRequest();
     }
   }
 }
 

-const Vector3& ControlImpl::GetMinimumSize() const
+const Vector3& Control::GetMinimumSize() const

 {
   return mImpl->mMinimumSize;
 }
 
 {
   return mImpl->mMinimumSize;
 }
 

-void ControlImpl::SetMaximumSize( const Vector3& size )
+void Control::SetMaximumSize( const Vector3& size )

 {
   if ( mImpl->mMaximumSize != size )
   {
     mImpl->mMaximumSize = size;
 
     // Only relayout if our control is using the maximum or range policy.
 {
   if ( mImpl->mMaximumSize != size )
   {
     mImpl->mMaximumSize = size;
 
     // Only relayout if our control is using the maximum or range policy.

-    if ( ( mImpl->mHeightPolicy == Control::Maximum ) || ( mImpl->mWidthPolicy  == Control::Maximum ) ||
-         ( mImpl->mHeightPolicy == Control::Range   ) || ( mImpl->mWidthPolicy  == Control::Range   ) )
+    if ( ( mImpl->mHeightPolicy == Toolkit::Control::Maximum ) || ( mImpl->mWidthPolicy  == Toolkit::Control::Maximum ) ||
+         ( mImpl->mHeightPolicy == Toolkit::Control::Range   ) || ( mImpl->mWidthPolicy  == Toolkit::Control::Range   ) )

     {
       RelayoutRequest();
     }
   }
 }
 
     {
       RelayoutRequest();
     }
   }
 }
 

-const Vector3& ControlImpl::GetMaximumSize() const
+const Vector3& Control::GetMaximumSize() const

 {
   return mImpl->mMaximumSize;
 }
 
 {
   return mImpl->mMaximumSize;
 }
 

-Vector3 ControlImpl::GetNaturalSize()
+Vector3 Control::GetNaturalSize()

 {
   // could be overridden in derived classes.
   return mImpl->mSetSize;
 }
 
 {
   // could be overridden in derived classes.
   return mImpl->mSetSize;
 }
 

-float ControlImpl::GetHeightForWidth( float width )
+float Control::GetHeightForWidth( float width )

 {
   // could be overridden in derived classes.
   float height( 0.0f );
 {
   // could be overridden in derived classes.
   float height( 0.0f );


@@ -977,7 +980,7 @@ float ControlImpl::GetHeightForWidth( float width )
   return height;
 }
 
   return height;
 }
 

-float ControlImpl::GetWidthForHeight( float height )
+float Control::GetWidthForHeight( float height )

 {
   // could be overridden in derived classes.
   float width( 0.0f );
 {
   // could be overridden in derived classes.
   float width( 0.0f );


@@ -988,48 +991,48 @@ float ControlImpl::GetWidthForHeight( float height )
   return width;
 }
 
   return width;
 }
 

-const Vector3& ControlImpl::GetControlSize() const
+const Vector3& Control::GetControlSize() const

 {
   return mImpl->mSize;
 }
 
 {
   return mImpl->mSize;
 }
 

-const Vector3& ControlImpl::GetSizeSet() const
+const Vector3& Control::GetSizeSet() const

 {
   return mImpl->mSetSize;
 }
 
 {
   return mImpl->mSetSize;
 }
 

-void ControlImpl::SetKeyInputFocus()
+void Control::SetKeyInputFocus()

 {
   if( Self().OnStage() )
   {
 {
   if( Self().OnStage() )
   {

-    KeyInputFocusManager::Get().SetFocus(Control::DownCast(Self()));
+    Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self()));

   }
 }
 
   }
 }
 

-bool ControlImpl::HasKeyInputFocus()
+bool Control::HasKeyInputFocus()

 {
   bool result = false;
   if( Self().OnStage() )
   {
 {
   bool result = false;
   if( Self().OnStage() )
   {

-    result = KeyInputFocusManager::Get().IsKeyboardListener(Control::DownCast(Self()));
+    result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self()));

   }
   return result;
 }
 
   }
   return result;
 }
 

-void ControlImpl::ClearKeyInputFocus()
+void Control::ClearKeyInputFocus()

 {
   if( Self().OnStage() )
   {
 {
   if( Self().OnStage() )
   {

-    KeyInputFocusManager::Get().RemoveFocus(Control::DownCast(Self()));
+    Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self()));

   }
 }
 
   }
 }
 

-void ControlImpl::RelayoutRequest()
+void Control::RelayoutRequest()

 {
   Internal::RelayoutController::Get().Request();
 }
 
 {
   Internal::RelayoutController::Get().Request();
 }
 

-void ControlImpl::Relayout( Vector2 size, ActorSizeContainer& container )
+void Control::Relayout( Vector2 size, ActorSizeContainer& container )

 {
   // Avoids relayout again when OnSizeSet callback arrives.
   {
 {
   // Avoids relayout again when OnSizeSet callback arrives.
   {


@@ -1041,11 +1044,11 @@ void ControlImpl::Relayout( Vector2 size, ActorSizeContainer& container )
   OnRelaidOut( size, container );
 }
 
   OnRelaidOut( size, container );
 }
 

-void ControlImpl::Relayout( Actor actor, Vector2 size, ActorSizeContainer& container )
+void Control::Relayout( Actor actor, Vector2 size, ActorSizeContainer& container )

 {
   if ( actor )
   {
 {
   if ( actor )
   {

-    Control control( Control::DownCast( actor ) );
+    Toolkit::Control control( Toolkit::Control::DownCast( actor ) );

     if( control )
     {
       control.GetImplementation().NegotiateSize( size, container );
     if( control )
     {
       control.GetImplementation().NegotiateSize( size, container );


@@ -1057,7 +1060,7 @@ void ControlImpl::Relayout( Actor actor, Vector2 size, ActorSizeContainer& conta
   }
 }
 
   }
 }
 

-void ControlImpl::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Control::OnRelaidOut( Vector2 size, ActorSizeContainer& container )

 {
   unsigned int numChildren = Self().GetChildCount();
 
 {
   unsigned int numChildren = Self().GetChildCount();
 


@@ -1067,13 +1070,13 @@ void ControlImpl::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
   }
 }
 
   }
 }
 

-void ControlImpl::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& container )
+void Control::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& container )

 {
   Vector2 size;
 
 {
   Vector2 size;
 

-  if ( mImpl->mWidthPolicy == Control::Fixed )
+  if ( mImpl->mWidthPolicy == Toolkit::Control::Fixed )

   {
   {

-    if ( mImpl->mHeightPolicy == Control::Fixed )
+    if ( mImpl->mHeightPolicy == Toolkit::Control::Fixed )

     {
       // If a control says it has a fixed size, then use the size set by the application / control.
       Vector2 setSize( mImpl->mSetSize );
     {
       // If a control says it has a fixed size, then use the size set by the application / control.
       Vector2 setSize( mImpl->mSetSize );


@@ -1120,7 +1123,7 @@ void ControlImpl::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& cont
   }
   else
   {
   }
   else
   {

-    if ( mImpl->mHeightPolicy == Control::Fixed )
+    if ( mImpl->mHeightPolicy == Toolkit::Control::Fixed )

     {
       // Height is fixed so if the application / control has set it, then use that.
       if ( !EqualsZero( mImpl->mSetSize.height ) )
     {
       // Height is fixed so if the application / control has set it, then use that.
       if ( !EqualsZero( mImpl->mSetSize.height ) )


@@ -1172,7 +1175,7 @@ void ControlImpl::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& cont
   Relayout( size, container );
 }
 
   Relayout( size, container );
 }
 

-bool ControlImpl::EmitKeyEventSignal( const KeyEvent& event )
+bool Control::EmitKeyEventSignal( const KeyEvent& event )

 {
   // Guard against destruction during signal emission
   Dali::Toolkit::Control handle( GetOwner() );
 {
   // Guard against destruction during signal emission
   Dali::Toolkit::Control handle( GetOwner() );


@@ -1194,27 +1197,29 @@ bool ControlImpl::EmitKeyEventSignal( const KeyEvent& event )
   return consumed;
 }
 
   return consumed;
 }
 

-void ControlImpl::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
+void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )

 {
   mImpl->SignalConnected( slotObserver, callback );
 }
 
 {
   mImpl->SignalConnected( slotObserver, callback );
 }
 

-void ControlImpl::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
+void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )

 {
   mImpl->SignalDisconnected( slotObserver, callback );
 }
 
 {
   mImpl->SignalDisconnected( slotObserver, callback );
 }
 

-std::size_t ControlImpl::GetConnectionCount() const
+std::size_t Control::GetConnectionCount() const

 {
   return mImpl->GetConnectionCount();
 }
 
 {
   return mImpl->GetConnectionCount();
 }
 

-ControlImpl::ControlImpl( bool requiresTouchEvents )
+Control::Control( bool requiresTouchEvents )

 : CustomActorImpl( requiresTouchEvents ),
   mImpl(new Impl(*this))
 {
 }
 
 : CustomActorImpl( requiresTouchEvents ),
   mImpl(new Impl(*this))
 {
 }
 

+} // namespace Internal
+

 } // namespace Toolkit
 
 } // namespace Dali
 } // namespace Toolkit
 
 } // namespace Dali

diff --git a/base/dali-toolkit/public-api/controls/control.cpp b/base/dali-toolkit/public-api/controls/control.cpp
index 8652f1a..58e293a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control.cpp
+++ b/base/dali-toolkit/public-api/controls/control.cpp
@@ -28,17 +28,7 @@ const char* const Control::SIGNAL_KEY_EVENT = "key-event";
 
 Control Control::New()
 {
 
 Control Control::New()
 {

-  // Use TypeRegistry to create instance of control so that the type-info matches Control rather than ControlImpl
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(Control) );
-  DALI_ASSERT_ALWAYS( typeInfo && "TypeRegistry returning Invalid TypeInfo" );
-
-  BaseHandle handle = typeInfo.CreateInstance();
-  DALI_ASSERT_ALWAYS( handle && "Unable to Create Control" );
-
-  Control control = DownCast( handle );
-  DALI_ASSERT_ALWAYS( handle && "TypeRegistry did not create a Control" );
-
-  return control;
+  return Internal::Control::New();

 }
 
 Control::Control()
 }
 
 Control::Control()


@@ -46,7 +36,7 @@ Control::Control()
 }
 
 Control::Control(const Control& uiControl)
 }
 
 Control::Control(const Control& uiControl)

-: CustomActor( uiControl ? static_cast<const ControlImpl&>( uiControl.GetImplementation() ).GetOwner() : NULL)
+: CustomActor( uiControl ? static_cast< const Internal::Control& >( uiControl.GetImplementation() ).GetOwner() : NULL)

 {
 }
 
 {
 }
 


@@ -65,17 +55,17 @@ Control& Control::operator=( const Control& handle )
 
 Control Control::DownCast( BaseHandle handle )
 {
 
 Control Control::DownCast( BaseHandle handle )
 {

-  return DownCast<Control, ControlImpl>(handle);
+  return DownCast< Control, Internal::Control >(handle);

 }
 
 }
 

-ControlImpl& Control::GetImplementation()
+Internal::Control& Control::GetImplementation()

 {
 {

-  return static_cast<ControlImpl&>(CustomActor::GetImplementation());
+  return static_cast<Internal::Control&>(CustomActor::GetImplementation());

 }
 
 }
 

-const ControlImpl& Control::GetImplementation() const
+const Internal::Control& Control::GetImplementation() const

 {
 {

-  return static_cast<const ControlImpl&>(CustomActor::GetImplementation());
+  return static_cast<const Internal::Control&>(CustomActor::GetImplementation());

 }
 
 void Control::SetSizePolicy( SizePolicy widthPolicy, SizePolicy heightPolicy )
 }
 
 void Control::SetSizePolicy( SizePolicy widthPolicy, SizePolicy heightPolicy )


@@ -213,7 +203,7 @@ std::size_t Control::GetConnectionCount() const
 }
 
 
 }
 
 

-Control::Control(ControlImpl& implementation)
+Control::Control(Internal::Control& implementation)

 : CustomActor(implementation)
 {
 }
 : CustomActor(implementation)
 {
 }


@@ -221,7 +211,7 @@ Control::Control(ControlImpl& implementation)
 Control::Control(Dali::Internal::CustomActor* internal)
 : CustomActor(internal)
 {
 Control::Control(Dali::Internal::CustomActor* internal)
 : CustomActor(internal)
 {

-  VerifyCustomActorPointer<ControlImpl>(internal);
+  VerifyCustomActorPointer<Internal::Control>(internal);

 }
 
 } // namespace Toolkit
 }
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
index 654322d..3cd35d4 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
@@ -54,7 +54,7 @@ Toolkit::ScrollConnector ScrollComponentImpl::GetScrollConnector() const
 }
 
 ScrollComponentImpl::ScrollComponentImpl()
 }
 
 ScrollComponentImpl::ScrollComponentImpl()

-: ControlImpl(true/*requires touch*/)
+: Control(true/*requires touch*/)

 {
 }
 
 {
 }
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
index 4e17af6..e7aa700 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
@@ -37,7 +37,7 @@ typedef IntrusivePtr<ScrollComponentImpl> ScrollComponentPtr;
  * Base class for scroll component implementations.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */
  * Base class for scroll component implementations.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */

-class ScrollComponentImpl : public ControlImpl
+class ScrollComponentImpl : public Internal::Control

 {
 public:
 
 {
 public:
 

diff --git a/capi/dali-toolkit/public-api/controls/control-impl.h b/capi/dali-toolkit/public-api/controls/control-impl.h
index bfe00b8..ff9e2c3 100644 (file)
--- a/capi/dali-toolkit/public-api/controls/control-impl.h
+++ b/capi/dali-toolkit/public-api/controls/control-impl.h
@@ -38,9 +38,12 @@ class RelayoutControllerImpl;
 class KeyInputFocusManager;
 }
 
 class KeyInputFocusManager;
 }
 

-typedef std::pair< Actor, Vector2 > ActorSizePair; ///< Pair of actor and size
+typedef std::pair< Actor, Vector2 > ActorSizePair;       ///< Pair of actor and size

 typedef std::vector< ActorSizePair > ActorSizeContainer; ///< Container of actors and their sizes
 
 typedef std::vector< ActorSizePair > ActorSizeContainer; ///< Container of actors and their sizes
 

+namespace Internal
+{
+

 /**
  * @brief This is the internal base class for all controls.
  *
 /**
  * @brief This is the internal base class for all controls.
  *


@@ -48,7 +51,7 @@ typedef std::vector< ActorSizePair > ActorSizeContainer; ///< Container of actor
  * Implements ConnectionTrackerInterface so that signals (typically connected to member functions) will
  * be disconnected automatically when the control is destroyed.
  */
  * Implements ConnectionTrackerInterface so that signals (typically connected to member functions) will
  * be disconnected automatically when the control is destroyed.
  */

-class ControlImpl : public CustomActorImpl, public ConnectionTrackerInterface
+class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface

 {
 public:
 
 {
 public:
 


@@ -67,14 +70,14 @@ public:
    * If touch is required then the user can connect to this class' touch signal.
    * @return A handle to the ConntrolImpl instance.
    */
    * If touch is required then the user can connect to this class' touch signal.
    * @return A handle to the ConntrolImpl instance.
    */

-  static Control New();
+  static Toolkit::Control New();

 
   // Destruction
 
   /**
    * @brief Virtual destructor.
    */
 
   // Destruction
 
   /**
    * @brief Virtual destructor.
    */

-  virtual ~ControlImpl();
+  virtual ~Control();

 
   // Actions
 
 
   // Actions
 


@@ -144,7 +147,7 @@ public:
    * @param[in] loopEnabled Whether the focus movement should be looped within the control.
    * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused.
    */
    * @param[in] loopEnabled Whether the focus movement should be looped within the control.
    * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused.
    */

-  virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);

 
   /**
    * @brief Informs this control that its chosen focusable actor will be focused.
 
   /**
    * @brief Informs this control that its chosen focusable actor will be focused.


@@ -511,58 +514,58 @@ private:
 protected: // Construction
 
   /**
 protected: // Construction
 
   /**

-   * @brief Create a ControlImpl.
+   * @brief Create a Control.

    *
    * @param[in] requiresTouchEvents True if the OnTouchEvent() callback is required.
    */
    *
    * @param[in] requiresTouchEvents True if the OnTouchEvent() callback is required.
    */

-  ControlImpl(bool requiresTouchEvents);
+  Control(bool requiresTouchEvents);

 
 public:
 
   // Size negotiation
 
   /**
 
 public:
 
   // Size negotiation
 
   /**

-   * @copydoc Control::SetSizePolicy()
+   * @copydoc Toolkit::Control::SetSizePolicy()

    */
    */

-  void SetSizePolicy( Control::SizePolicy widthPolicy, Control::SizePolicy heightPolicy );
+  void SetSizePolicy( Toolkit::Control::SizePolicy widthPolicy, Toolkit::Control::SizePolicy heightPolicy );

 
   /**
 
   /**

-   * @copydoc Control::GetSizePolicy()
+   * @copydoc Toolkit::Control::GetSizePolicy()

    */
    */

-  void GetSizePolicy( Control::SizePolicy& widthPolicy, Control::SizePolicy& heightPolicy ) const;
+  void GetSizePolicy( Toolkit::Control::SizePolicy& widthPolicy, Toolkit::Control::SizePolicy& heightPolicy ) const;

 
   /**
 
   /**

-   * @copydoc Control::SetMinimumSize()
+   * @copydoc Toolkit::Control::SetMinimumSize()

    */
   void SetMinimumSize( const Vector3& size );
 
   /**
    */
   void SetMinimumSize( const Vector3& size );
 
   /**

-   * @copydoc Control::GetMinimumSize()
+   * @copydoc Toolkit::Control::GetMinimumSize()

    */
   const Vector3& GetMinimumSize() const;
 
   /**
    */
   const Vector3& GetMinimumSize() const;
 
   /**

-   * @copydoc Control::SetMaximumSize()
+   * @copydoc Toolkit::Control::SetMaximumSize()

    */
   void SetMaximumSize( const Vector3& size );
 
   /**
    */
   void SetMaximumSize( const Vector3& size );
 
   /**

-   * @copydoc Control::GetMaximumSize()
+   * @copydoc Toolkit::Control::GetMaximumSize()

    */
   const Vector3& GetMaximumSize() const;
 
   /**
    */
   const Vector3& GetMaximumSize() const;
 
   /**

-   * @copydoc Control::GetNaturalSize()
+   * @copydoc Toolkit::Control::GetNaturalSize()

    */
   virtual Vector3 GetNaturalSize();
 
   /**
    */
   virtual Vector3 GetNaturalSize();
 
   /**

-   * @copydoc Control::GetHeightForWidth()
+   * @copydoc Toolkit::Control::GetHeightForWidth()

    */
   virtual float GetHeightForWidth( float width );
 
   /**
    */
   virtual float GetHeightForWidth( float width );
 
   /**

-   * @copydoc Control::GetWidthForHeight()
+   * @copydoc Toolkit::Control::GetWidthForHeight()

    */
   virtual float GetWidthForHeight( float height );
 
    */
   virtual float GetWidthForHeight( float height );
 


@@ -583,17 +586,17 @@ public:
   //KeyInput
 
   /**
   //KeyInput
 
   /**

-   * @copydoc Control::SetKeyInputFocus()
+   * @copydoc Toolkit::Control::SetKeyInputFocus()

    */
   void SetKeyInputFocus();
 
   /**
    */
   void SetKeyInputFocus();
 
   /**

-   * @copydoc Control::HasKeyInputFocus()
+   * @copydoc Toolkit::Control::HasKeyInputFocus()

    */
   bool HasKeyInputFocus();
 
   /**
    */
   bool HasKeyInputFocus();
 
   /**

-   * @copydoc Control::ClearKeyInputFocus()
+   * @copydoc Toolkit::Control::ClearKeyInputFocus()

    */
   void ClearKeyInputFocus();
 
    */
   void ClearKeyInputFocus();
 


@@ -686,8 +689,8 @@ private:
 private:
 
   // Undefined
 private:
 
   // Undefined

-  ControlImpl(const ControlImpl&);
-  ControlImpl& operator=(const ControlImpl&);
+  Control(const Control&);
+  Control& operator=(const Control&);

 
   class Impl;
   Impl *mImpl;
 
   class Impl;
   Impl *mImpl;


@@ -697,6 +700,10 @@ private:
   friend class Internal::KeyInputFocusManager;     ///< KeyInputFocusManager needs to call which is private.
 };
 
   friend class Internal::KeyInputFocusManager;     ///< KeyInputFocusManager needs to call which is private.
 };
 

+} // namespace Internal
+
+typedef Internal::Control ControlImpl; ///< @deprecated, Use Internal::Control
+

 } // namespace Toolkit
 
 } // namespace Dali
 } // namespace Toolkit
 
 } // namespace Dali

diff --git a/capi/dali-toolkit/public-api/controls/control.h b/capi/dali-toolkit/public-api/controls/control.h
index 26baa51..d22f6b4 100644 (file)
--- a/capi/dali-toolkit/public-api/controls/control.h
+++ b/capi/dali-toolkit/public-api/controls/control.h
@@ -33,13 +33,16 @@ namespace Toolkit
 
 //Forward declarations.
 
 
 //Forward declarations.
 

-class ControlImpl;
+namespace Internal
+{
+class Control;
+}

 
 /**
  * @brief Control is the base class for all controls.
  *
 
 /**
  * @brief Control is the base class for all controls.
  *

- * The implementation of the control must be supplied; see ControlImpl for more details.
- * @see ControlImpl
+ * The implementation of the control must be supplied; see Internal::Control for more details.
+ * @see Internal::Control

  */
 class Control : public CustomActor, public ConnectionTrackerInterface
 {
  */
 class Control : public CustomActor, public ConnectionTrackerInterface
 {


@@ -165,14 +168,14 @@ public:
    *
    * @return The implementation.
    */
    *
    * @return The implementation.
    */

-  ControlImpl& GetImplementation();
+  Internal::Control& GetImplementation();

 
   /**
    * @brief Retrieve the Control implementation.
    *
    * @return The implementation.
    */
 
   /**
    * @brief Retrieve the Control implementation.
    *
    * @return The implementation.
    */

-  const ControlImpl& GetImplementation() const;
+  const Internal::Control& GetImplementation() const;

 
   // Size Negotiation
 
 
   // Size Negotiation
 


@@ -393,7 +396,7 @@ public: // Not intended for application developers
    * @param[in] implementation The implementation for this control.
    * @return A handle to a newly allocated Dali resource.
    */
    * @param[in] implementation The implementation for this control.
    * @return A handle to a newly allocated Dali resource.
    */

-  Control(ControlImpl& implementation);
+  Control(Internal::Control& implementation);

 
   /**
    * @brief This constructor is used by CustomActor within Dali core to create additional Control handles
 
   /**
    * @brief This constructor is used by CustomActor within Dali core to create additional Control handles

diff --git a/optional/dali-toolkit/internal/builder/builder-impl.cpp b/optional/dali-toolkit/internal/builder/builder-impl.cpp
index abf8b57..ae6e036 100644 (file)
--- a/optional/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/optional/dali-toolkit/internal/builder/builder-impl.cpp
@@ -464,7 +464,6 @@ BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
     baseHandle       = typeInfo.CreateInstance();
     Handle handle    = Handle::DownCast(baseHandle);
     Actor actor      = Actor::DownCast(handle);
     baseHandle       = typeInfo.CreateInstance();
     Handle handle    = Handle::DownCast(baseHandle);
     Actor actor      = Actor::DownCast(handle);

-    Control control  = Control::DownCast(handle);

 
     if(handle)
     {
 
     if(handle)
     {


@@ -483,6 +482,7 @@ BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
         DALI_SCRIPT_VERBOSE("  Is Actor id=%d\n", actor.GetId());
       }
 
         DALI_SCRIPT_VERBOSE("  Is Actor id=%d\n", actor.GetId());
       }
 

+      Toolkit::Control control  = Toolkit::Control::DownCast(handle);

       if(control)
       {
         DALI_SCRIPT_VERBOSE("  Is Control id=%d\n", actor.GetId());
       if(control)
       {
         DALI_SCRIPT_VERBOSE("  Is Control id=%d\n", actor.GetId());

diff --git a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
index 8251623..dde4f19 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
@@ -119,7 +119,7 @@ const char* const COMPOSITE_FRAGMENT_SOURCE =
 
 
 BloomView::BloomView()
 
 
 BloomView::BloomView()

-  : ControlImpl( false )  // doesn't require touch events
+  : Control( false )  // doesn't require touch events

   , mBlurNumSamples(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES)
   , mBlurBellCurveWidth(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_BELL_CURVE_WIDTH)
   , mPixelFormat(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_RENDER_TARGET_PIXEL_FORMAT)
   , mBlurNumSamples(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES)
   , mBlurBellCurveWidth(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_BELL_CURVE_WIDTH)
   , mPixelFormat(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_RENDER_TARGET_PIXEL_FORMAT)


@@ -141,7 +141,7 @@ BloomView::BloomView()
 
 BloomView::BloomView( const unsigned int blurNumSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat,
                                     const float downsampleWidthScale, const float downsampleHeightScale)
 
 BloomView::BloomView( const unsigned int blurNumSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat,
                                     const float downsampleWidthScale, const float downsampleHeightScale)

-  : ControlImpl( false )  // doesn't require touch events
+  : Control( false )  // doesn't require touch events

   , mBlurNumSamples(blurNumSamples)
   , mBlurBellCurveWidth(blurBellCurveWidth)
   , mPixelFormat(renderTargetPixelFormat)
   , mBlurNumSamples(blurNumSamples)
   , mBlurBellCurveWidth(blurBellCurveWidth)
   , mPixelFormat(renderTargetPixelFormat)

diff --git a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
index 72b0385..9ab72b4 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
@@ -41,7 +41,7 @@ namespace Internal
 /**
  * BloomEffect implementation class
  */
 /**
  * BloomEffect implementation class
  */

-class BloomView : public ControlImpl
+class BloomView : public Control

 {
 public:
   /**
 {
 public:
   /**

diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index 90223ee..8083191 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -36,7 +36,7 @@ BubbleEmitter::BubbleEmitter( const Vector2& movementArea,
                               Image shapeImage,
                               unsigned int maximumNumberOfBubble,
                               const Vector2& bubbleSizeRange )
                               Image shapeImage,
                               unsigned int maximumNumberOfBubble,
                               const Vector2& bubbleSizeRange )

-: ControlImpl( true ),
+: Control( true ),

   mMovementArea( movementArea ),
   mShapeImage( shapeImage ),
   mTotalNumOfBubble( maximumNumberOfBubble ),
   mMovementArea( movementArea ),
   mShapeImage( shapeImage ),
   mTotalNumOfBubble( maximumNumberOfBubble ),

diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
index 5a42bc7..d74b884 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
+++ b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
@@ -37,7 +37,7 @@ namespace Internal
 /**
  * BubbleEmitter implementation class.
  */
 /**
  * BubbleEmitter implementation class.
  */

-class BubbleEmitter : public ControlImpl
+class BubbleEmitter : public Control

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
index 1c4a249..5659788 100644 (file)
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
@@ -80,7 +80,7 @@ Dali::Toolkit::Cluster Cluster::New(Toolkit::ClusterStyle& style)
 }
 
 Cluster::Cluster(Toolkit::ClusterStyle& style)
 }
 
 Cluster::Cluster(Toolkit::ClusterStyle& style)

-: ControlImpl(true/*requires touch*/),
+: Control(true/*requires touch*/),

   mClusterStyle(style),
   mExpandedCount(0)
 {
   mClusterStyle(style),
   mExpandedCount(0)
 {

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
index 4d62606..d5c466c 100644 (file)
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
@@ -68,7 +68,7 @@ typedef ChildInfoContainer::const_iterator ChildInfoConstIter;
  * Multiple cluster styles may be provided, to determine the position, size, rotation, scale, color and visibility
  * of the child actors in the cluster.
  */
  * Multiple cluster styles may be provided, to determine the position, size, rotation, scale, color and visibility
  * of the child actors in the cluster.
  */

-class Cluster : public ControlImpl
+class Cluster : public Control

 {
 public:
 
 {
 public:
 


@@ -230,9 +230,9 @@ private:
    */
   void DoTransformAction(const PropertyValueContainer& attributes);
 
    */
   void DoTransformAction(const PropertyValueContainer& attributes);
 

-private: // From ControlImpl
+private: // From Control

   /**
   /**

-   * From Toolkit::ControlImpl; called shortly before a child is removed from the owning actor.
+   * From Control; called shortly before a child is removed from the owning actor.

    * @param[in] child The child being removed.Ptr
    */
   virtual void OnControlChildRemove(Actor& child);
    * @param[in] child The child being removed.Ptr
    */
   virtual void OnControlChildRemove(Actor& child);


@@ -248,7 +248,7 @@ public:
    */
   static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
 
    */
   static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()

diff --git a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
index a513c55..ef36347 100644 (file)
--- a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
@@ -100,7 +100,7 @@ Toolkit::EffectsView EffectsView::New()
 }
 
 EffectsView::EffectsView()
 }
 
 EffectsView::EffectsView()

-: ControlImpl( false ),
+: Control( false ),

   mEffectType( Toolkit::EffectsView::INVALID_TYPE ),
   mPixelFormat( EFFECTS_VIEW_DEFAULT_PIXEL_FORMAT ),
   mSpread(0.0f),
   mEffectType( Toolkit::EffectsView::INVALID_TYPE ),
   mPixelFormat( EFFECTS_VIEW_DEFAULT_PIXEL_FORMAT ),
   mSpread(0.0f),


@@ -273,7 +273,7 @@ Vector4 EffectsView::GetBackgroundColor() const
   return mBackgroundColor;
 }
 
   return mBackgroundColor;
 }
 

-// From ControlImpl
+// From Control

 void EffectsView::OnInitialize()
 {
   //////////////////////////////////////////////////////
 void EffectsView::OnInitialize()
 {
   //////////////////////////////////////////////////////

diff --git a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
index 560a71b..ee37e69 100644 (file)
--- a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
@@ -42,7 +42,7 @@ class ImageFilter;
  * EffectsView implementation class
  * @copydoc Dali::Toolkit::EffectsView
  */
  * EffectsView implementation class
  * @copydoc Dali::Toolkit::EffectsView
  */

-class EffectsView : public ControlImpl
+class EffectsView : public Control

 {
 public:
   /// @copydoc Dali::Toolkit::EffectsView New()
 {
 public:
   /// @copydoc Dali::Toolkit::EffectsView New()


@@ -121,7 +121,7 @@ private:
    */
   void SetupProperties();
 
    */
   void SetupProperties();
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()

diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
index 1ffa7af..b77a121 100644 (file)
--- a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
@@ -111,7 +111,7 @@ const char* const GAUSSIAN_BLUR_FRAGMENT_SOURCE =
 
 
 GaussianBlurView::GaussianBlurView()
 
 
 GaussianBlurView::GaussianBlurView()

-  : ControlImpl( false )  // doesn't require touch events
+  : Control( false )  // doesn't require touch events

   , mNumSamples(GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES)
 
   , mPixelFormat(GAUSSIAN_BLUR_VIEW_DEFAULT_RENDER_TARGET_PIXEL_FORMAT)
   , mNumSamples(GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES)
 
   , mPixelFormat(GAUSSIAN_BLUR_VIEW_DEFAULT_RENDER_TARGET_PIXEL_FORMAT)


@@ -132,7 +132,7 @@ GaussianBlurView::GaussianBlurView()
 GaussianBlurView::GaussianBlurView( const unsigned int numSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat,
                                     const float downsampleWidthScale, const float downsampleHeightScale,
                                     bool blurUserImage)
 GaussianBlurView::GaussianBlurView( const unsigned int numSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat,
                                     const float downsampleWidthScale, const float downsampleHeightScale,
                                     bool blurUserImage)

-  : ControlImpl( false )  // doesn't require touch events
+  : Control( false )  // doesn't require touch events

   , mNumSamples(numSamples)
   , mPixelFormat(renderTargetPixelFormat)
   , mDownsampleWidthScale(downsampleWidthScale)
   , mNumSamples(numSamples)
   , mPixelFormat(renderTargetPixelFormat)
   , mDownsampleWidthScale(downsampleWidthScale)

diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
index f57dd49..c7627a9 100644 (file)
--- a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
@@ -40,7 +40,7 @@ namespace Internal
 /**
  * GaussianBlurView implementation class
  */
 /**
  * GaussianBlurView implementation class
  */

-class GaussianBlurView : public ControlImpl
+class GaussianBlurView : public Control

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 52b2536..68782e9 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -86,7 +86,7 @@ Dali::Toolkit::ImageView ImageView::New()
 }
 
 ImageView::ImageView()
 }
 
 ImageView::ImageView()

-: ControlImpl(true)
+: Control(true)

 {
 }
 
 {
 }
 

diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
index 9c0f89a..d23589c 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -41,7 +41,7 @@ typedef IntrusivePtr<ImageView>    ImageViewPtr;
 /**
  * @copydoc Toolkit::ImageView
  */
 /**
  * @copydoc Toolkit::ImageView
  */

-class ImageView : public ControlImpl
+class ImageView : public Control

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
index 8329e65..0422021 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
@@ -474,7 +474,7 @@ Dali::Toolkit::MaskedImageView::MaskedImageViewSignal& MaskedImageView::MaskFini
 }
 
 MaskedImageView::MaskedImageView()
 }
 
 MaskedImageView::MaskedImageView()

-: ControlImpl(true),
+: Control(true),

   mEditMode( Dali::Toolkit::MaskedImageView::EDIT_DISABLED ),
   mSelfPropertySetting( false ),
   mSourceRotation( Dali::Toolkit::MaskedImageView::ROTATE_0 ),
   mEditMode( Dali::Toolkit::MaskedImageView::EDIT_DISABLED ),
   mSelfPropertySetting( false ),
   mSourceRotation( Dali::Toolkit::MaskedImageView::ROTATE_0 ),

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
index ea213f5..4329c42 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
@@ -34,7 +34,7 @@ namespace Internal
 /**
  * @copydoc Dali::Toolkit::MaskedImageView
  */
 /**
  * @copydoc Dali::Toolkit::MaskedImageView
  */

-class MaskedImageView : public ControlImpl
+class MaskedImageView : public Control

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
index bb57902..cbe156b 100644 (file)
--- a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
@@ -161,7 +161,7 @@ Dali::Toolkit::Magnifier Magnifier::New()
 }
 
 Magnifier::Magnifier()
 }
 
 Magnifier::Magnifier()

-: ControlImpl(true),
+: Control(true),

   mPropertySourcePosition(Property::INVALID_INDEX),
   mActorSize(Vector3::ZERO),
   mMagnificationFactor(1.0f)
   mPropertySourcePosition(Property::INVALID_INDEX),
   mActorSize(Vector3::ZERO),
   mMagnificationFactor(1.0f)

diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
index d18fa24..f4ef612 100644 (file)
--- a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
+++ b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
@@ -38,7 +38,7 @@ typedef IntrusivePtr<Magnifier>    MagnifierPtr;
 /**
  * @copydoc Toolkit::Magnifier
  */
 /**
  * @copydoc Toolkit::Magnifier
  */

-class Magnifier : public ControlImpl
+class Magnifier : public Control

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
index 37ca96a..8731515 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
@@ -46,7 +46,7 @@ TypeAction a2(mType, Toolkit::NavigationControl::ACTION_POP, &NavigationControl:
 }
 
 NavigationControl::NavigationControl()
 }
 
 NavigationControl::NavigationControl()

-: ControlImpl( true ),
+: Control( true ),

   mToolBar(NULL),
   mTitleBar(NULL),
   mOrientationAngle( 0 ),
   mToolBar(NULL),
   mTitleBar(NULL),
   mOrientationAngle( 0 ),

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
index 964de5a..32cfce3 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
@@ -47,7 +47,7 @@ class NavigationBar;
  * NavigationControl implements a controller than manages the navigation of hierarchical contents.
  * @see Dali::Toolkit::NavigationControl for more details.
  */
  * NavigationControl implements a controller than manages the navigation of hierarchical contents.
  * @see Dali::Toolkit::NavigationControl for more details.
  */

-class NavigationControl : public ControlImpl
+class NavigationControl : public Control

 {
 public:
 
 {
 public:
 


@@ -136,36 +136,36 @@ public:
    */
   Toolkit::NavigationControl::ItemPoppedSignalV2& ItemPoppedSignal();
 
    */
   Toolkit::NavigationControl::ItemPoppedSignalV2& ItemPoppedSignal();
 

-private: // override functions from ControlImpl
+private: // override functions from Control

 
   /**
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnInitialize()
+   * @copydoc Control::OnInitialize()

    */
   virtual void OnInitialize();
 
   /**
    */
   virtual void OnInitialize();
 
   /**

-   * From ControlImpl; called after a child has been added to the owning actor.
+   * From Control; called after a child has been added to the owning actor.

    * @param[in] child The child which has been added.
    */
   virtual void OnControlChildAdd( Actor& child );
 
   /**
    * @param[in] child The child which has been added.
    */
   virtual void OnControlChildAdd( Actor& child );
 
   /**

-   * @copydoc Toolkit::ControlImple::OnStageConnection()
+   * @copydoc Control::OnStageConnection()

    */
   virtual void OnStageConnection();
 
   /**
    */
   virtual void OnStageConnection();
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()

    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnControlSizeSet
+   * @copydoc Control::OnControlSizeSet

    */
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**
    */
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnKeyEvent()
+   * @copydoc Control::OnKeyEvent()

    */
   virtual bool OnKeyEvent( const KeyEvent& event );
 
    */
   virtual bool OnKeyEvent( const KeyEvent& event );
 

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
index 0b15d12..4e5c50e 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
@@ -44,7 +44,7 @@ TypeRegistration mType( typeid(Toolkit::Page), typeid(CustomActor), Create );
 } // unnamed namespace
 
 Page::Page()
 } // unnamed namespace
 
 Page::Page()

-: ControlImpl(false),
+: Control(false),

   mTitle(""),
   mSubTitle("")
 {
   mTitle(""),
   mSubTitle("")
 {

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
index 2db0ad6..3eedf0c 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
@@ -40,7 +40,7 @@ namespace Internal
  * @see Dali::Toolkit::Page for more details
  */
 
  * @see Dali::Toolkit::Page for more details
  */
 

-class Page : public ControlImpl
+class Page : public Control

 {
 
 public:
 {
 
 public:


@@ -116,7 +116,7 @@ public:
    */
   Toolkit::Popup GetPopupMenu() const;
 
    */
   Toolkit::Popup GetPopupMenu() const;
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index 17f859a..f508b54 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@ -250,7 +250,7 @@ const int PageTurnView::NUMBER_OF_CACHED_PAGES = NUMBER_OF_CACHED_PAGES_EACH_SID
 const float PageTurnView::STATIC_PAGE_INTERVAL_DISTANCE = 1.0f;
 
 PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )
 const float PageTurnView::STATIC_PAGE_INTERVAL_DISTANCE = 1.0f;
 
 PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )

-: ControlImpl( true ),
+: Control( true ),

   mPageFactory( pageFactory ),
   mPageSize( pageSize ),
   mIsEditMode( false ),
   mPageFactory( pageFactory ),
   mPageSize( pageSize ),
   mIsEditMode( false ),

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index 1354c19..c074ade 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -36,7 +36,7 @@ namespace Toolkit
 namespace Internal
 {
 
 namespace Internal
 {
 

-class PageTurnView : public ControlImpl
+class PageTurnView : public Control

 {
 protected:
 
 {
 protected:
 


@@ -179,7 +179,7 @@ private:
    */
   void RenderPage( int pageIndex );
 
    */
   void RenderPage( int pageIndex );
 

-private: // from ControlImpl
+private: // from Control

 
   /**
    * @copydoc Toolkit::Control::OnPan
 
   /**
    * @copydoc Toolkit::Control::OnPan

diff --git a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
index eac92bd..dabae5e 100644 (file)
--- a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
@@ -101,7 +101,7 @@ void RotatingSelector::OnInitialize()
 }
 
 RotatingSelector::RotatingSelector()
 }
 
 RotatingSelector::RotatingSelector()

-: ControlImpl(true/*requires touch*/),
+: Control(true/*requires touch*/),

   mSelected(false),
   mSelectable(true),
   mIsAnimating(false)
   mSelected(false),
   mSelectable(true),
   mIsAnimating(false)

diff --git a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
index 95e4b56..b3283d4 100644 (file)
--- a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
+++ b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
@@ -38,7 +38,7 @@ class RotatingSelector;
 /**
  * RotatingSelector is a custom control for text aligning and multiline support
  */
 /**
  * RotatingSelector is a custom control for text aligning and multiline support
  */

-class RotatingSelector : public ControlImpl
+class RotatingSelector : public Control

 {
 public:
 
 {
 public:
 


@@ -104,7 +104,7 @@ public:
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()

diff --git a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
index 23d709c..ec3197a 100644 (file)
--- a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
@@ -116,7 +116,7 @@ struct EqualToConstraintMatrix
 } // namespace
 
 ShadowView::ShadowView( float downsampleWidthScale, float downsampleHeightScale )
 } // namespace
 
 ShadowView::ShadowView( float downsampleWidthScale, float downsampleHeightScale )

-: ControlImpl( false ),  // doesn't require touch events
+: Control( false ),  // doesn't require touch events

   mChildrenRoot(Actor::New()),
   mCachedShadowColor(DEFAULT_SHADOW_COLOR),
   mCachedBackgroundColor(DEFAULT_SHADOW_COLOR.r, DEFAULT_SHADOW_COLOR.g, DEFAULT_SHADOW_COLOR.b, 0.0f),
   mChildrenRoot(Actor::New()),
   mCachedShadowColor(DEFAULT_SHADOW_COLOR),
   mCachedBackgroundColor(DEFAULT_SHADOW_COLOR.r, DEFAULT_SHADOW_COLOR.g, DEFAULT_SHADOW_COLOR.b, 0.0f),

diff --git a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
index aa10428..20ed3eb 100644 (file)
--- a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
@@ -41,7 +41,7 @@ namespace Internal
 /**
  * ShadowView implementation class
  */
 /**
  * ShadowView implementation class
  */

-class ShadowView : public ControlImpl
+class ShadowView : public Control

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
index d27eed4..7ec9d7b 100755 (executable)
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -29,33 +29,33 @@ namespace Toolkit
 {
 
 // Properties
 {
 
 // Properties

-const Property::Index Slider::LOWER_BOUND_PROPERTY             = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1;
-const Property::Index Slider::UPPER_BOUND_PROPERTY             = ControlImpl::CONTROL_PROPERTY_END_INDEX + 2;
+const Property::Index Slider::LOWER_BOUND_PROPERTY             = Internal::Slider::SLIDER_PROPERTY_START_INDEX;
+const Property::Index Slider::UPPER_BOUND_PROPERTY             = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 1;

 
 

-const Property::Index Slider::VALUE_PROPERTY                   = ControlImpl::CONTROL_PROPERTY_END_INDEX + 3;
-const Property::Index Slider::HIT_REGION_PROPERTY              = ControlImpl::CONTROL_PROPERTY_END_INDEX + 4;
-const Property::Index Slider::BACKING_REGION_PROPERTY          = ControlImpl::CONTROL_PROPERTY_END_INDEX + 5;
-const Property::Index Slider::HANDLE_REGION_PROPERTY           = ControlImpl::CONTROL_PROPERTY_END_INDEX + 6;
+const Property::Index Slider::VALUE_PROPERTY                   = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 2;
+const Property::Index Slider::HIT_REGION_PROPERTY              = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 3;
+const Property::Index Slider::BACKING_REGION_PROPERTY          = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 4;
+const Property::Index Slider::HANDLE_REGION_PROPERTY           = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 5;

 
 

-const Property::Index Slider::BACKING_IMAGE_NAME_PROPERTY      = ControlImpl::CONTROL_PROPERTY_END_INDEX + 7;
-const Property::Index Slider::HANDLE_IMAGE_NAME_PROPERTY       = ControlImpl::CONTROL_PROPERTY_END_INDEX + 8;
-const Property::Index Slider::PROGRESS_IMAGE_NAME_PROPERTY     = ControlImpl::CONTROL_PROPERTY_END_INDEX + 9;
-const Property::Index Slider::POPUP_IMAGE_NAME_PROPERTY        = ControlImpl::CONTROL_PROPERTY_END_INDEX + 10;
-const Property::Index Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY  = ControlImpl::CONTROL_PROPERTY_END_INDEX + 11;
+const Property::Index Slider::BACKING_IMAGE_NAME_PROPERTY      = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 6;
+const Property::Index Slider::HANDLE_IMAGE_NAME_PROPERTY       = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 7;
+const Property::Index Slider::PROGRESS_IMAGE_NAME_PROPERTY     = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 8;
+const Property::Index Slider::POPUP_IMAGE_NAME_PROPERTY        = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 9;
+const Property::Index Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY  = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 10;

 
 

-const Property::Index Slider::DISABLE_COLOR_PROPERTY           = ControlImpl::CONTROL_PROPERTY_END_INDEX + 12;
-const Property::Index Slider::POPUP_TEXT_COLOR_PROPERTY        = ControlImpl::CONTROL_PROPERTY_END_INDEX + 13;
+const Property::Index Slider::DISABLE_COLOR_PROPERTY           = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 11;
+const Property::Index Slider::POPUP_TEXT_COLOR_PROPERTY        = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 12;

 
 

-const Property::Index Slider::VALUE_PRECISION_PROPERTY         = ControlImpl::CONTROL_PROPERTY_END_INDEX + 14;
+const Property::Index Slider::VALUE_PRECISION_PROPERTY         = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 13;

 
 

-const Property::Index Slider::SHOW_POPUP_PROPERTY              = ControlImpl::CONTROL_PROPERTY_END_INDEX + 15;
-const Property::Index Slider::SHOW_VALUE_PROPERTY              = ControlImpl::CONTROL_PROPERTY_END_INDEX + 16;
+const Property::Index Slider::SHOW_POPUP_PROPERTY              = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 14;
+const Property::Index Slider::SHOW_VALUE_PROPERTY              = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 15;

 
 

-const Property::Index Slider::ENABLED_PROPERTY                 = ControlImpl::CONTROL_PROPERTY_END_INDEX + 17;
+const Property::Index Slider::ENABLED_PROPERTY                 = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 16;

 
 

-const Property::Index Slider::MARKS_PROPERTY                   = ControlImpl::CONTROL_PROPERTY_END_INDEX + 18;
-const Property::Index Slider::SNAP_TO_MARKS_PROPERTY           = ControlImpl::CONTROL_PROPERTY_END_INDEX + 19;
-const Property::Index Slider::MARK_TOLERANCE_PROPERTY          = ControlImpl::CONTROL_PROPERTY_END_INDEX + 20;
+const Property::Index Slider::MARKS_PROPERTY                   = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 17;
+const Property::Index Slider::SNAP_TO_MARKS_PROPERTY           = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 18;
+const Property::Index Slider::MARK_TOLERANCE_PROPERTY          = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 19;

 
 namespace Internal
 {
 
 namespace Internal
 {


@@ -168,7 +168,7 @@ Dali::Toolkit::Slider Slider::New()
 }
 
 Slider::Slider()
 }
 
 Slider::Slider()

-: ControlImpl( true ),
+: Control( true ),

   mState( NORMAL ),
   mDisableColor( 0.0f, 0.0f, 0.0f, 0.0f ),
   mPopupTextColor( 0.0f, 0.0f, 0.0f, 0.0f ),
   mState( NORMAL ),
   mDisableColor( 0.0f, 0.0f, 0.0f, 0.0f ),
   mPopupTextColor( 0.0f, 0.0f, 0.0f, 0.0f ),


@@ -547,7 +547,7 @@ Toolkit::TextView Slider::CreatePopupText()
   Toolkit::TextView textView = Toolkit::TextView::New();
   textView.SetParentOrigin( ParentOrigin::CENTER );
   textView.SetAnchorPoint( AnchorPoint::CENTER );
   Toolkit::TextView textView = Toolkit::TextView::New();
   textView.SetParentOrigin( ParentOrigin::CENTER );
   textView.SetAnchorPoint( AnchorPoint::CENTER );

-  textView.SetSizePolicy( Control::Flexible, Control::Flexible );
+  textView.SetSizePolicy( Toolkit::Control::Flexible, Toolkit::Control::Flexible );

   textView.SetZ( VALUE_DISPLAY_TEXT_Z );
   return textView;
 }
   textView.SetZ( VALUE_DISPLAY_TEXT_Z );
   return textView;
 }

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.h b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
index 8da4de1..c797311 100755 (executable)
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
@@ -41,10 +41,17 @@ typedef Dali::IntrusivePtr< Slider > SliderPtr;
 /**
  * @copydoc Toolkit::Slider
  */
 /**
  * @copydoc Toolkit::Slider
  */

-class Slider : public ControlImpl
+class Slider : public Control

 {
 public:
 
 {
 public:
 

+  // Properties
+  enum
+  {
+    SLIDER_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
+    SLIDER_PROPERTY_END_INDEX = SLIDER_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
+  };
+

   typedef Property::Array MarkList;
 
   /**
   typedef Property::Array MarkList;
 
   /**


@@ -283,7 +290,7 @@ protected:
   virtual ~Slider();
 
   /**
   virtual ~Slider();
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnControlSizeSet( const Vector3& size )
+   * @copydoc Control::OnControlSizeSet( const Vector3& size )

    */
   virtual void OnControlSizeSet( const Vector3& size );
 
    */
   virtual void OnControlSizeSet( const Vector3& size );
 

diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 17f2b55..fdbcd34 100644 (file)
--- a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -97,7 +97,7 @@ PropertyRegistration property1( typeRegistration, "image", Toolkit::SuperBlurVie
 } // unnamed namespace
 
 SuperBlurView::SuperBlurView( unsigned int blurLevels )
 } // unnamed namespace
 
 SuperBlurView::SuperBlurView( unsigned int blurLevels )

-: ControlImpl( false ),
+: Control( false ),

   mBlurLevels( blurLevels ),
   mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
   mResourcesCleared( true ),
   mBlurLevels( blurLevels ),
   mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
   mResourcesCleared( true ),

diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
index b5d35c5..25060f7 100644 (file)
--- a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
@@ -37,14 +37,14 @@ namespace Internal
 /**
  * SuperBlurView implementation class
  */
 /**
  * SuperBlurView implementation class
  */

-class SuperBlurView : public ControlImpl
+class SuperBlurView : public Control

 {
 public:
 
   // Properties
   enum
   {
 {
 public:
 
   // Properties
   enum
   {

-    SUPER_BLUR_VIEW_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+    SUPER_BLUR_VIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,

     SUPER_BLUR_VIEW_PROPERTY_END_INDEX = SUPER_BLUR_VIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 
     SUPER_BLUR_VIEW_PROPERTY_END_INDEX = SUPER_BLUR_VIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 


@@ -115,7 +115,7 @@ protected:
    */
   virtual ~SuperBlurView();
 
    */
   virtual ~SuperBlurView();
 

-private: // from ControlImpl
+private: // from Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize
 
   /**
    * @copydoc Toolkit::Control::OnInitialize


@@ -128,7 +128,7 @@ private: // from ControlImpl
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**

-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()

    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index 64160ed..703cf87 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -287,7 +287,7 @@ void ToolBar::RemoveControl( Actor control )
 }
 
 ToolBar::ToolBar()
 }
 
 ToolBar::ToolBar()

-: ControlImpl( false ),  // doesn't require touch events
+: Control( false ),  // doesn't require touch events

   mLayout(),
   mLeftOffset( 0 ),
   mCenterBase( 1 ),
   mLayout(),
   mLeftOffset( 0 ),
   mCenterBase( 1 ),

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 9a58aec..e5e365d 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -39,7 +39,7 @@ namespace Internal
  * ToolBar is a control to create a tool bar.
  * @see Dali::Toolkit::ToolBar for more details.
  */
  * ToolBar is a control to create a tool bar.
  * @see Dali::Toolkit::ToolBar for more details.
  */

-class ToolBar : public ControlImpl
+class ToolBar : public Control

 {
 public:
 
 {
 public:
 


@@ -64,7 +64,7 @@ public:
    */
   void RemoveControl( Dali::Actor control );
 
    */
   void RemoveControl( Dali::Actor control );
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()


@@ -75,7 +75,7 @@ private: // From ControlImpl
    * Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group).
    * @param child The control to be added.
    *
    * Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group).
    * @param child The control to be added.
    *

-   * @see Toolkit::ControlImpl::OnControlChildAdd()
+   * @see Control::OnControlChildAdd()

    */
   virtual void OnControlChildAdd(Actor& child);
 
    */
   virtual void OnControlChildAdd(Actor& child);
 

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
index a756f94..b27d509 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -269,7 +269,7 @@ bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* trac
 }
 
 View::View(bool fullscreen)
 }
 
 View::View(bool fullscreen)

-: ControlImpl( false ),  // doesn't require touch events
+: Control( false ),  // doesn't require touch events

   mOrientation( -1 ),
   mFullScreen(fullscreen),
   mContentLayers(),
   mOrientation( -1 ),
   mFullScreen(fullscreen),
   mContentLayers(),

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
index ea0a4c5..22499bf 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.h
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.h
@@ -39,7 +39,7 @@ namespace Internal
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */

-class View : public ControlImpl
+class View : public Control

 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;
 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;


@@ -127,7 +127,7 @@ public:
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()