fixing some of the comments and changing copy-by-value to by reference in size negoti...

Change-Id: I1eb8b787e0880083def5483bde4b95644047f4f6

diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index bd8dc04..e887cb4 100644 (file)
--- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -454,7 +454,7 @@ const Toolkit::Alignment::Padding& Alignment::GetPadding() const
   return mPadding;
 }
 
   return mPadding;
 }
 

-void Alignment::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Alignment::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   // lay out the actors
   Vector3 anchorPointAndParentOrigin  = Vector3::ZERO;
 {
   // lay out the actors
   Vector3 anchorPointAndParentOrigin  = Vector3::ZERO;

diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.h b/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
index 132ccb0..3788d84 100644 (file)
--- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
+++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
@@ -82,9 +82,9 @@ public:
 private: // From Control
 
   /**
 private: // From Control
 
   /**

-   * @copydoc Control::OnRelaidOut()
+   * @copydoc Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
 private:
 
 
 private:
 

diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index 35913a4..2bcb901 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -162,7 +162,7 @@ void RadioButton::ToggleState()
   SetSelected(!mSelected);
 }
 
   SetSelected(!mSelected);
 }
 

-void RadioButton::OnRelaidOut( Vector2 /*size*/, ActorSizeContainer& container )
+void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )

 {
   Vector3 newSize( mRadioIcon.GetNaturalSize() );
 
 {
   Vector3 newSize( mRadioIcon.GetNaturalSize() );
 

diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index dc61742..07c622b 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -101,9 +101,9 @@ class RadioButton: public Button
   void ToggleState();
 
   /**
   void ToggleState();
 
   /**

-   * @copydoc Dali::Toolkit::Control::OnRelaidOut(Vector2 size, ActorSizeContainer& container)
+   * @copydoc Dali::Toolkit::Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
  public:
   // Properties
 
  public:
   // Properties

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 03c560c..1134b6e 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -666,7 +666,7 @@ void Popup::OnControlChildAdd( Actor& child )
   }
 }
 
   }
 }
 

-void Popup::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   // Set the popup size
   Vector2 popupSize;
 {
   // Set the popup size
   Vector2 popupSize;

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.h b/base/dali-toolkit/internal/controls/popup/popup-impl.h
index 1073b25..b716c09 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -251,9 +251,9 @@ private:
   virtual void OnControlChildAdd( Actor& child );
 
   /**
   virtual void OnControlChildAdd( Actor& child );
 
   /**

-   * @copydoc Control::OnRelaidOut()
+   * @copydoc Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
   /**
    * @copydoc Control::OnKeyEvent()
 
   /**
    * @copydoc Control::OnKeyEvent()

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 85099f5..0db4cbf 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
@@ -625,7 +625,7 @@ float TableView::GetLayoutAnimationDuration()
   return mConstraintDuration;
 }
 
   return mConstraintDuration;
 }
 

-void TableView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   float fixedHeightsTotal = 0.0f;
   float fixedWidthsTotal = 0.0f;
 {
   float fixedHeightsTotal = 0.0f;
   float fixedWidthsTotal = 0.0f;

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 183c822..82110a3 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
@@ -225,9 +225,9 @@ private: // From Control
   virtual void OnControlChildRemove(Actor& child);
 
   /**
   virtual void OnControlChildRemove(Actor& child);
 
   /**

-   * @copydoc Control::OnRelaidOut
+   * @copydoc Control::OnRelayout

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

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

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 cbda7fb..e891f5b 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
@@ -1166,7 +1166,7 @@ void TextInput::OnControlSizeSet(const Vector3& targetSize)
   mActiveLayer.SetSize(targetSize);
 }
 
   mActiveLayer.SetSize(targetSize);
 }
 

-void TextInput::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void TextInput::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   Relayout( mDisplayedTextView, size, container );
   Relayout( mPopupPanel.GetRootActor(), size, container );
 {
   Relayout( mDisplayedTextView, size, container );
   Relayout( mPopupPanel.GetRootActor(), size, container );

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 c60d6bc..f913ead 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
@@ -576,9 +576,9 @@ private: // From Control
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**

-   * @copydoc Control::OnRelaidOut()
+   * @copydoc Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
   /**
    * Retrieves the text-input's natural size by calling TextView::GetNaturalSize().
 
   /**
    * Retrieves the text-input's natural size by calling TextView::GetNaturalSize().

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 6ba6ce1..01566d6 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
@@ -1229,7 +1229,7 @@ void TextView::OnControlSizeSet( const Vector3& size )
   }
 }
 
   }
 }
 

-void TextView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void TextView::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
   {
 {
   if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
   {

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 ac82fc8..235fede 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
@@ -75,8 +75,8 @@ public:
     EllipsizeEnd          ///< Ellipsized by the end if it exceeds the width and/or the height.
   };
 
     EllipsizeEnd          ///< Ellipsized by the end if it exceeds the width and/or the height.
   };
 

-  // Between two OnRelaidOut methods, several calls to InsertTextAt, RemoveTextFrom or SetText can happen.
-  // TextViewProcessorMetadata stores the type of operation. A vector stores all operations between two OnRelaidOut calls.
+  // Between two OnRelayout methods, several calls to InsertTextAt, RemoveTextFrom or SetText can happen.
+  // TextViewProcessorMetadata stores the type of operation. A vector stores all operations between two OnRelayout calls.

 
   enum TextViewProcessorMetadataType
   {
 
   enum TextViewProcessorMetadataType
   {


@@ -89,7 +89,7 @@ public:
   };
 
   /**
   };
 
   /**

-   * Stores info about which data structures need to be modified when the OnRelaidOut() method is called
+   * Stores info about which data structures need to be modified when the OnRelayout() method is called

    */
   struct TextViewProcessorMetadata
   {
    */
   struct TextViewProcessorMetadata
   {


@@ -382,11 +382,9 @@ private: // From Control
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**

-   * @copydoc Toolkit::Control::OnRelaidOut()
-   *
-   * Removes text-actor and calls DoRelayOut()..
+   * @copydoc Toolkit::Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
   /**
    * Retrieves the text-view's natural size.
 
   /**
    * Retrieves the text-view's natural size.


@@ -456,7 +454,7 @@ private:
   /**
    * Process Snapshot. It refresh the render-task in order to generate a new snapshot image.
    *
   /**
    * Process Snapshot. It refresh the render-task in order to generate a new snapshot image.
    *

-   * ProcessSnapshot is called from OnRelaidOut() only if text has been relaid out.
+   * ProcessSnapshot is called from OnRelayout() only if text has been relaid out.

    * It creates a new image buffer only if the size of the text has changed.
    *
    * @param[in] textViewSize The new text-view's size.
    * It creates a new image buffer only if the size of the text has changed.
    *
    * @param[in] textViewSize The new text-view's size.


@@ -708,7 +706,7 @@ public:
 private:
 
   MarkupProcessor::StyledTextArray       mCurrentStyledText;           ///< text currently displayed by the view
 private:
 
   MarkupProcessor::StyledTextArray       mCurrentStyledText;           ///< text currently displayed by the view

-  std::vector<TextViewProcessorMetadata> mTextViewProcessorOperations; ///< Stores all relayout operations which arrive between two consecutive OnRelaidOut() calls.
+  std::vector<TextViewProcessorMetadata> mTextViewProcessorOperations; ///< Stores all relayout operations which arrive between two consecutive OnRelayout() calls.

 
   LayoutParameters                       mLayoutParameters;            ///< Stores some layout parameters in a struct. To be passed in layout functions.
   VisualParameters                       mVisualParameters;            ///< Some parameters which afects text-view visualization.
 
   LayoutParameters                       mLayoutParameters;            ///< Stores some layout parameters in a struct. To be passed in layout functions.
   VisualParameters                       mVisualParameters;            ///< Some parameters which afects text-view visualization.

diff --git a/base/dali-toolkit/public-api/controls/alignment/alignment.h b/base/dali-toolkit/public-api/controls/alignment/alignment.h
index 42faf30..e4db745 100644 (file)
--- a/base/dali-toolkit/public-api/controls/alignment/alignment.h
+++ b/base/dali-toolkit/public-api/controls/alignment/alignment.h
@@ -151,7 +151,8 @@ public:
 
   /**
    * @brief Sets the new alignment. By default ( HorizontalCenter | VerticalCenter ).
 
   /**
    * @brief Sets the new alignment. By default ( HorizontalCenter | VerticalCenter ).

-   * Note! there should only be one horizontal and one vertical policy
+   *
+   * @note there should only be one horizontal and one vertical policy

    * @param [in] type The new alignment option.
    */
   void SetAlignmentType( Type type );
    * @param [in] type The new alignment option.
    */
   void SetAlignmentType( Type type );

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index 8a924f9..e6ba7db 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -865,7 +865,7 @@ 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 Control::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& container )
+void Control::NegotiateSize( const Vector2& allocatedSize, ActorSizeContainer& container )

 {
   Vector2 size;
 
 {
   Vector2 size;
 


@@ -967,7 +967,12 @@ void Control::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& containe
                  allocatedSize.x, allocatedSize.y,
                  size.x, size.y );
 
                  allocatedSize.x, allocatedSize.y,
                  size.x, size.y );
 

-  Relayout( size, container );
+  // Avoids relayout again when OnSizeSet callback arrives as a function of us or deriving class calling SetSize()
+  mImpl->mInsideRelayout = true;
+  Self().SetSize( size );
+  // Only relayout controls which requested to be relaid out.
+  OnRelayout( size, container );
+  mImpl->mInsideRelayout = false;

 }
 
 void Control::SetAsKeyboardFocusGroup(bool isFocusGroup)
 }
 
 void Control::SetAsKeyboardFocusGroup(bool isFocusGroup)


@@ -1178,7 +1183,7 @@ void Control::RelayoutRequest()
   }
 }
 
   }
 }
 

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

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


@@ -1259,7 +1264,7 @@ void Control::OnControlSizeSet( const Vector3& size )
 {
 }
 
 {
 }
 

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

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


@@ -1393,18 +1398,6 @@ void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange cha
   }
 }
 
   }
 }
 

-void Control::Relayout(Vector2 size, ActorSizeContainer& container)
-{
-  // Avoids relayout again when OnSizeSet callback arrives.
-  mImpl->mInsideRelayout = true;
-  Self().SetSize( size );
-  // @todo this really needs to be at the end of method but not sure why the scope used to be only the SetSize, needs to be cleaned up in size negotiation rework
-  mImpl->mInsideRelayout = false;
-
-  // Only relayout controls which requested to be relaid out.
-  OnRelaidOut( size, container );
-}
-

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

diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h
index ff01046..8a5c7e0 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.h
+++ b/base/dali-toolkit/public-api/controls/control-impl.h
@@ -125,6 +125,9 @@ public:
    * @brief This method is called during size negotiation when a height is required for a given width.
    *
    * Derived classes should override this if they wish to customize the height returned.
    * @brief This method is called during size negotiation when a height is required for a given width.
    *
    * Derived classes should override this if they wish to customize the height returned.

+   *
+   * @param width to use.
+   * @return the height based on the width.

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


@@ -132,6 +135,9 @@ public:
    * @brief This method is called during size negotiation when a width is required for a given height.
    *
    * Derived classes should override this if they wish to customize the width returned.
    * @brief This method is called during size negotiation when a width is required for a given height.
    *
    * Derived classes should override this if they wish to customize the width returned.

+   *
+   * @param height to use.
+   * @return the width based on the width.

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


@@ -306,7 +312,7 @@ public:
    * @param[in,out]  container  The container that holds actors that are fed back into the
    *                            RelayoutController algorithm.
    */
    * @param[in,out]  container  The container that holds actors that are fed back into the
    *                            RelayoutController algorithm.
    */

-  DALI_INTERNAL void NegotiateSize( Vector2 size, ActorSizeContainer& container );
+  DALI_INTERNAL void NegotiateSize( const Vector2& size, ActorSizeContainer& container );

 
   // Keyboard Focus
 
 
   // Keyboard Focus
 


@@ -435,22 +441,17 @@ protected:
   // Size Negotiation
 
   /**
   // Size Negotiation
 
   /**

-   * @brief Sends a request to be relaid-out.
+   * @brief Request a relayout, which means performing a size negotiation on this control, its parent and children (and potentially whole scene)

    *
    *

-   * This method is called from OnStageConnection(), OnChildAdd(),
-   * OnChildRemove(), SetSizePolicy(), SetMinimumSize() and
-   * SetMaximumSize().
+   * This method is automatically called from OnStageConnection(), OnChildAdd(),
+   * OnChildRemove(), SetSizePolicy(), SetMinimumSize() and SetMaximumSize().

    *
    *

-   * This method could also be called from derived classes every time
-   * a control's poperty change and it needs to be relaid-out.  After
-   * the Dali::Stage::SignalMessageQueueFlushed() is emitted a
-   * relayout process starts and all controls which called this method
-   * will be relaid-out.
+   * This method can also be called from a derived class every time it needs a different size.
+   * At the end of event processing, the relayout process starts and
+   * all controls which requested Relayout will have their sizes (re)negotiated.

    *
    *

-   * @note RelayoutRequest() only sends a request per Control before
-   * the Dali::Stage::SignalMessageQueueFlushed() signal is
-   * emitted. That means a control will be relaid-out only once, even
-   * if more than one request is sent between two consecutive signals.
+   * @note RelayoutRequest() can be called multiple times; the size negotiation is still
+   * only performed once, i.e. there is no need to keep track of this in the calling side.

    */
   void RelayoutRequest();
 
    */
   void RelayoutRequest();
 


@@ -462,7 +463,7 @@ protected:
    * @param[in]      size       The size to allocate to the actor.
    * @param[in,out]  container  The container that holds actors that have not been allocated a size yet.
    */
    * @param[in]      size       The size to allocate to the actor.
    * @param[in,out]  container  The container that holds actors that have not been allocated a size yet.
    */

-  static void Relayout( Actor actor, Vector2 size, ActorSizeContainer& container );
+  static void Relayout( Actor actor, const Vector2& size, ActorSizeContainer& container );

 
 private:
 
 
 private:
 


@@ -594,18 +595,22 @@ private:
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**

-   * @brief Called after the Dali::Stage::SignalMessageQueueFlushed()
-   * signal is emitted if this control requested to be relaid-out.
+   * @brief Called after the size negotiation has been finished for this control.
+   *
+   * The control is expected to assign this given size to itself/its children.

    *
    * Should be overridden by derived classes if they need to layout
    * actors differently after certain operations like add or remove
    *
    * Should be overridden by derived classes if they need to layout
    * actors differently after certain operations like add or remove

-   * actors, resize or after changing especific properties.
+   * actors, resize or after changing specific properties.
+   *
+   * Note! As this function is called from inside the size negotiation algorithm, you cannot
+   * call RequestRelayout (the call would just be ignored)

    *
    * @param[in]      size       The allocated size.
    * @param[in,out]  container  The control should add actors to this container that it is not able
    *                            to allocate a size for.
    */
    *
    * @param[in]      size       The allocated size.
    * @param[in,out]  container  The control should add actors to this container that it is not able
    *                            to allocate a size for.
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
   /**
    * @brief Called when the control gains key input focus.
 
   /**
    * @brief Called when the control gains key input focus.


@@ -738,19 +743,6 @@ private:
    */
   DALI_INTERNAL void DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
 
    */
   DALI_INTERNAL void DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
 

-  // Size Negotiation
-
-  /**
-   * @brief Called by NegotiateSize when the size to allocate to the control has been calculated.
-   *
-   * It calls the OnRelaidOut() method which can be overridden by derived classes.
-   *
-   * @param[in]      size       The allocated size.
-   * @param[in,out]  container  The control should add actors to this container that it is not able
-   *                            to allocate a size for.
-   */
-  DALI_INTERNAL void Relayout( Vector2 size, ActorSizeContainer& container );
-

 private:
 
   // Undefined
 private:
 
   // Undefined

diff --git a/docs/content/programming-guide/size-negotiation.h b/docs/content/programming-guide/size-negotiation.h
index c802155..d53bc39 100644 (file)
--- a/docs/content/programming-guide/size-negotiation.h
+++ b/docs/content/programming-guide/size-negotiation.h
@@ -391,7 +391,7 @@ Vector3 ControlA::GetNaturalSize()
 GetHeightForWidth() and GetWidthForHeight() can be created in a similar manner.
 
 @code
 GetHeightForWidth() and GetWidthForHeight() can be created in a similar manner.
 
 @code

-void ControlA::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void ControlA::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   // Width to be shared between ControlD and ActorD
   Vector2 childSize( size.width * 0.5f, size.height );
 {
   // Width to be shared between ControlD and ActorD
   Vector2 childSize( size.width * 0.5f, size.height );


@@ -441,7 +441,7 @@ In this example we have the following requirements:
 </tr></table>
 
 @code
 </tr></table>
 
 @code

-void ControlA::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void ControlA::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   // Width of children is our size minus border
   Vector3 childSize( size.width - mBorder.width * 2.0f,
 {
   // Width of children is our size minus border
   Vector3 childSize( size.width - mBorder.width * 2.0f,

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 6ac4c6f..8ef5ec6 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
@@ -278,7 +278,7 @@ Layer NavigationControl::GetBarLayer() const
   return mBarLayer;
 }
 
   return mBarLayer;
 }
 

-void NavigationControl::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void NavigationControl::OnRelayout( const Vector2& size, ActorSizeContainer& container )

 {
   const Vector2 setSize( size );
 
 {
   const Vector2 setSize( size );
 

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 516a7da..1962246 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
@@ -155,9 +155,9 @@ private: // override functions from Control
   virtual void OnStageConnection();
 
   /**
   virtual void OnStageConnection();
 
   /**

-   * @copydoc Control::OnRelaidOut()
+   * @copydoc Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
   /**
    * @copydoc Control::OnControlSizeSet
 
   /**
    * @copydoc Control::OnControlSizeSet

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 b1f4ae7..3b2443b 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
@@ -246,7 +246,7 @@ void SuperBlurView::ClearBlurResource()
   }
 }
 
   }
 }
 

-void SuperBlurView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void SuperBlurView::OnRelayout( const Vector2& size, ActorSizeContainer& container )

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

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 5d4ca38..db9c613 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
@@ -128,9 +128,9 @@ private: // from Control
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**

-   * @copydoc Control::OnRelaidOut()
+   * @copydoc Control::OnRelayout()

    */
    */

-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );

 
 private:
 
 
 private:
 

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 d49c718..207ffe6 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
@@ -352,11 +352,6 @@ void ToolBar::OnControlChildAdd(Actor& child)
   // actor is in mLayout not in Self().
 }
 
   // actor is in mLayout not in Self().
 }
 

-void ToolBar::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
-{
-  Relayout( mLayout, size, container );
-}
-

 void ToolBar::OnControlSizeSet( const Vector3& targetSize )
 {
   mToolBarSize = targetSize;
 void ToolBar::OnControlSizeSet( const Vector3& targetSize )
 {
   mToolBarSize = targetSize;

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 2b2fa6d..933943e 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
@@ -82,13 +82,6 @@ private: // From Control
   virtual void OnControlChildAdd(Actor& child);
 
   /**
   virtual void OnControlChildAdd(Actor& child);
 
   /**

-   * Called when the tool-bar is relaid out.
-   * @param[in] size The size allocated.
-   * @param[in/out] container the container to put actors not handled.
-   */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
-
-  /**

    *
    * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
    */
    *
    * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
    */