Merge "Scrollable public API clean-up phase 1" into tizen

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / tool-bar / tool-bar-impl.h

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 9a58aec..933943e 100644 (file)
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -1,23 +1,25 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
 #define __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include <dali/dali.h>
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -39,7 +41,7 @@ namespace Internal
  * 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:
 
@@ -64,7 +66,7 @@ public:
    */
   void RemoveControl( Dali::Actor control );
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
@@ -75,16 +77,15 @@ 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.
    *
-   * @see Toolkit::ControlImpl::OnControlChildAdd()
+   * @see Control::OnControlChildAdd()
    */
   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.
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
    */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnControlSizeSet( const Vector3& targetSize );
 
 private:
   /**
@@ -134,6 +135,8 @@ private:
   float              mRightRelativeSpace;       ///< Relative space between center and right groups of controls.
   float              mAccumulatedRelativeSpace; ///< Stores the total percentage space used by controls.
   bool               mInitializing;             ///< Allows the use of Actor's API to add controls.
+  Vector3            mToolBarSize;              ///< The size of tool bar
+  Actor              mBackground;               ///< The background of the tool bar
 
   std::map<Actor/*control*/,Toolkit::Alignment> mControls; ///< Stores a relationship between controls and their alignments used to place them inside the table view.
 };