Merge "Fix license issue" into devel/master

diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index 6991f32..325a9cd 100644 (file)
--- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
+++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@ -533,7 +533,8 @@ void PrimitiveVisual::CreateConic( Vector<Vertex>& vertices, Vector<unsigned sho
 void PrimitiveVisual::CreateBevelledCube( Vector<Vertex>& vertices, Vector<unsigned short>& indices,
                                             Vector3 dimensions, float bevelPercentage, float bevelSmoothness )
 {
-  dimensions.Normalize();
+  float maxDimension = std::max( std::max( dimensions.x, dimensions.y ), dimensions.z );
+  dimensions = dimensions / maxDimension;
 
   if( bevelPercentage <= MIN_BEVEL_PERCENTAGE ) //No bevel, form a cube.
   {

diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i
index cad4100..3a1cd6d 100644 (file)
--- a/plugins/dali-swig/SWIG/dali-core.i
+++ b/plugins/dali-swig/SWIG/dali-core.i
@@ -82,6 +82,8 @@
 %ignore *::GetOwner() const;
 %ignore *::ParentOrigin::DEFAULT;
 %ignore *::AnchorPoint::DEFAULT;
+%ignore *::SetPositionInheritanceMode(PositionInheritanceMode);
+%ignore *::GetKeyValue(SizeType) const;
 
 %rename(ParentOriginTop) Dali::ParentOrigin::TOP;
 %rename(ParentOriginBottom) Dali::ParentOrigin::BOTTOM;
@@ -172,6 +174,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/object/property-index-ranges.h>
 %include <dali/public-api/object/property.h>
 %include <dali/public-api/object/property-array.h>
+%include <dali/public-api/object/property-key.h>
 %include <dali/public-api/object/property-map.h>
 %include <dali/public-api/object/property-types.h>
 %include <dali/public-api/object/property-value.h>
@@ -254,10 +257,9 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/images/native-image.h>
 %include <dali/public-api/images/native-image-interface.h>
 %include <dali/public-api/images/resource-image.h>
-%include <dali/public-api/images/nine-patch-image.h>
 %include <dali/public-api/images/frame-buffer-image.h>
+%include <dali/devel-api/images/nine-patch-image.h>
 
-%include <dali/public-api/actors/blending.h>
 %include <dali/public-api/actors/camera-actor.h>
 
 %template(StringValuePair) std::pair<std::string, Dali::Property::Value>;

diff --git a/plugins/dali-swig/SWIG/dali-operator.i b/plugins/dali-swig/SWIG/dali-operator.i
index 2029eb2..f6bbe4d 100644 (file)
--- a/plugins/dali-swig/SWIG/dali-operator.i
+++ b/plugins/dali-swig/SWIG/dali-operator.i
@@ -38,7 +38,7 @@
   public static Vector2 operator+(Vector2 arg1, Vector2 arg2) {
     return arg1.Add(arg2);
   }
-  
+
   public static Vector2 operator-(Vector2 arg1, Vector2 arg2) {
     return arg1.Subtract(arg2);
   }
@@ -128,7 +128,7 @@
   public static Vector4 operator+(Vector4 arg1, Vector4 arg2) {
     return arg1.Add(arg2);
   }
-  
+
   public static Vector4 operator-(Vector4 arg1, Vector4 arg2) {
     return arg1.Subtract(arg2);
   }
@@ -179,7 +179,7 @@
   public static Quaternion operator+(Quaternion arg1, Quaternion arg2) {
     return arg1.Add(arg2);
   }
-  
+
   public static Quaternion operator-(Quaternion arg1, Quaternion arg2) {
     return arg1.Subtract(arg2);
   }
@@ -241,11 +241,10 @@
   public static bool operator<(Uint16Pair arg1, Uint16Pair arg2) {
     return arg1.LessThan(arg2);
   }
-  
+
   public static bool operator>(Uint16Pair arg1, Uint16Pair arg2) {
     return arg1.GreaterThan(arg2);
   }
- 
 %}
 
 /**

diff --git a/plugins/dali-swig/SWIG/dali-toolkit.i b/plugins/dali-swig/SWIG/dali-toolkit.i
index 16040a8..1a9c001 100644 (file)
--- a/plugins/dali-swig/SWIG/dali-toolkit.i
+++ b/plugins/dali-swig/SWIG/dali-toolkit.i
@@ -43,6 +43,8 @@
 %ignore *::PageTurnView(Dali::Internal::CustomActor*);
 %ignore *::Popup(Internal::Popup&);
 %ignore *::Popup(Dali::Internal::CustomActor*);
+%ignore *::ProgressBar(Internal::ProgressBar&);
+%ignore *::ProgressBar(Dali::Internal::CustomActor*);
 %ignore *::PushButton(Internal::PushButton&);
 %ignore *::PushButton(Dali::Internal::CustomActor*);
 %ignore *::RadioButton(Internal::RadioButton&);
@@ -72,6 +74,25 @@
 %ignore *::GetExtension();
 %ignore *::GetControlExtension();
 
+%ignore *::Button::SetAnimationTime(float animationTime);
+%ignore *::Button::SetAutoRepeating(bool);
+%ignore *::Button::SetBackgroundImage(const std::string &);
+%ignore *::Button::SetButtonImage(Dali::Image);
+%ignore *::Button::SetDisabled(bool);
+%ignore *::Button::SetDisabledBackgroundImage(const std::string &);
+%ignore *::Button::SetDisabledImage(const std::string &);
+%ignore *::Button::SetDisabledSelectedImage(const std::string &);
+%ignore *::Button::SetInitialAutoRepeatingDelay(float);
+%ignore *::Button::SetLabel(Dali::Actor);
+%ignore *::Button::SetLabelText(const std::string &);
+%ignore *::Button::SetNextAutoRepeatingDelay(float);
+%ignore *::Button::SetSelected(bool);
+%ignore *::Button::SetSelectedBackgroundImage(const std::string &);
+%ignore *::Button::SetSelectedImage(const std::string &);
+%ignore *::Button::SetSelectedImage(Dali::Image);
+%ignore *::Button::SetTogglableButton(bool);
+%ignore *::Button::SetUnselectedImage(const std::string &);
+
 %rename(ControlImpl) Dali::Toolkit::Internal::Control;
 %rename(VisualBase) Dali::Toolkit::Visual::Base;
 %rename(ControlOrientationType) Dali::Toolkit::ControlOrientation::Type;
@@ -143,19 +164,14 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/controls/buttons/push-button.h>
 %include <dali-toolkit/public-api/controls/buttons/radio-button.h>
 %include <dali-toolkit/public-api/controls/flex-container/flex-container.h>
-%include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 %include <dali-toolkit/public-api/controls/image-view/image-view.h>
 %include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
 %include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 %include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 %include <dali-toolkit/public-api/enums.h>
+%include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-%include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
 %include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
@@ -172,7 +188,14 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/styling/style-manager.h>
 %include <dali-toolkit/public-api/controls/slider/slider.h>
 %include <dali-toolkit/public-api/controls/video-view/video-view.h>
+
 %include <dali-toolkit/devel-api/controls/popup/popup.h>
+%include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
+%include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 
 %include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 %include <dali-toolkit/devel-api/visual-factory/visual-factory.h>

diff --git a/plugins/dali-swig/SWIG/dali.i b/plugins/dali-swig/SWIG/dali.i
index fc97545..15bd0e3 100644 (file)
--- a/plugins/dali-swig/SWIG/dali.i
+++ b/plugins/dali-swig/SWIG/dali.i
@@ -51,6 +51,7 @@
 #include <dali/public-api/math/matrix.h>
 #include <dali/public-api/math/matrix3.h>
 #include <dali/public-api/math/viewport.h>
+#include <dali/public-api/object/property-key.h>
 
 
 #include <dali/public-api/adaptor-framework/timer.h>
@@ -58,8 +59,16 @@
 #include <dali/public-api/adaptor-framework/style-change.h>
 #include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
 
+#include <dali/devel-api/images/nine-patch-image.h>
+
 #include <dali-toolkit/devel-api/builder/builder.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
+#include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>

diff --git a/plugins/dali-swig/SWIG/signals.i b/plugins/dali-swig/SWIG/signals.i
index 865ce46..7eb190a 100644 (file)
--- a/plugins/dali-swig/SWIG/signals.i
+++ b/plugins/dali-swig/SWIG/signals.i
@@ -319,10 +319,10 @@ DALI_SIGNAL_1_PARAM( const Dali::RefObject* );
 DALI_SIGNAL_1_PARAM( const Dali::RenderTask& );
 
 // Signal< bool ( const Dali::Toolkit::AccessibilityManager& ) >
-DALI_SIGNAL_1_PARAM_RETURN( bool ,Dali::Toolkit::AccessibilityManager& );
+DALI_SIGNAL_1_PARAM_RETURN( bool, Dali::Toolkit::AccessibilityManager& );
 
 // Signal< bool ( const Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& ) >
-DALI_SIGNAL_2_PARAM_RETURN( bool ,const Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& );
+DALI_SIGNAL_2_PARAM_RETURN( bool, const Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& );
 
 // Signal< void ( const Dali::Actor Dali::Toolkit::AccessibilityManager::FocusOvershotDirection ) >
 DALI_SIGNAL_2_PARAM( Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection );