X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fview%2Fview-impl.h;h=5352afed74b8a4d7c51219f77234302ebb15b94a;hb=refs%2Fchanges%2F49%2F34949%2F3;hp=22499bf5dfac643221fec9742f5d868b86b934f5;hpb=00ef589046a32c53d20de1c61af7cc69524e51dc;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
index 22499bf..5352afe 100644
--- a/optional/dali-toolkit/internal/controls/view/view-impl.h
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.h
@@ -1,24 +1,27 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_VIEW_H__
 #define __DALI_TOOLKIT_INTERNAL_VIEW_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.
-//
+/*
+ * 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/dali.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -114,7 +117,7 @@ public:
   /**
    * @copydoc Dali::Toolkit::View::AnimationStartedSignalOrientation()
    */
-  Toolkit::View::OrientationAnimationStartedSignalV2& OrientationAnimationStartedSignal();
+  Toolkit::View::OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -134,6 +137,12 @@ private: // From Control
    */
   virtual void OnInitialize();
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 private:
 
 
@@ -171,8 +180,9 @@ private:
   Animation      mRotateAnimation;        ///< The animation which rotates the view (and all layers added to it)
   float          mOrientationFunction[4]; ///< The orientation function used to transform from degrees to the internal orientation.
   bool           mAutoRotateEnabled;      ///< Whether the view rotates if the OrientationChanged method is called.
+  Vector3        mViewSize;               ///< The Control Size
 
-  Toolkit::View::OrientationAnimationStartedSignalV2 mOrientationAnimationStartedSignalV2;
+  Toolkit::View::OrientationAnimationStartedSignalType mOrientationAnimationStartedSignal;
 };
 
 } // namespace Internal