Merge "Deprecate the public APIs taking Image as input" into devel/master

diff --git a/automated-tests/packaging/core-dali-toolkit-tests.spec b/automated-tests/packaging/core-dali-toolkit-tests.spec
index 58ba556..046b020 100644 (file)
--- a/automated-tests/packaging/core-dali-toolkit-tests.spec
+++ b/automated-tests/packaging/core-dali-toolkit-tests.spec
@@ -5,7 +5,7 @@ Summary:    Core API unit TC (%{name})
 Version:    0.1
 Release:    0
 Group:      Development/Tools
-License:    Apache License, Version 2.0, Samsung Properietary
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Requires:       dali
 Requires:       dali-adaptor

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/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 3ea50b0..be2c809 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 2;
-const unsigned int TOOLKIT_MICRO_VERSION = 6;
+const unsigned int TOOLKIT_MICRO_VERSION = 7;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/docs/content/programming-guide/constraints.h b/docs/content/programming-guide/constraints.h
index 7780cc2..6c4f194 100644 (file)
--- a/docs/content/programming-guide/constraints.h
+++ b/docs/content/programming-guide/constraints.h
@@ -202,7 +202,7 @@ struct MyFunctor
     else
     {
       // Otherwise it will blend between fully opaque and transparent
-      current.a = ( 100.0f - mDistance ) / 100.0f;
+      current.a = ( mDistance - distance ) / mDistance;
     }
   }
 

diff --git a/docs/content/programming-guide/dali-application.h b/docs/content/programming-guide/dali-application.h
index 3ca80c2..acd37f8 100644 (file)
--- a/docs/content/programming-guide/dali-application.h
+++ b/docs/content/programming-guide/dali-application.h
@@ -39,8 +39,8 @@ void CreateProgram(Application& app)
 
 int main (int argc, char **argv)
 {
-  Dali::Application app = Application::New(argc, argv);
-  app.SignalInit().Connect(&CreateProgram);
+  Dali::Application app = Application::New(&argc, &argv);
+  app.InitSignal().Connect(&CreateProgram);
   app.MainLoop();
 }
 @endcode
@@ -60,7 +60,7 @@ bool Tick()
 
 // Elsewhere
 Dali::Timer timer = Dali::Timer::New(2000); // 2 second timeout
-timer.SignalTick().Connect(&Tick);
+timer.TickSignal().Connect(&Tick);
 ...
 @endcode
 

diff --git a/docs/content/programming-guide/properties.h b/docs/content/programming-guide/properties.h
index 40ce183..aafaf25 100644 (file)
--- a/docs/content/programming-guide/properties.h
+++ b/docs/content/programming-guide/properties.h
@@ -189,10 +189,10 @@ shows the index range of the different properties in place.
 |:----------------------|:--------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------:|
 | Default               | Properties defined within DALi Core, e.g. Dali::Actor, Dali::ShaderEffect default properties etc. | \link Dali::DEFAULT_OBJECT_PROPERTY_START_INDEX DEFAULT_OBJECT_PROPERTY_START_INDEX\endlink                | \link Dali::DEFAULT_PROPERTY_MAX_COUNT DEFAULT_PROPERTY_MAX_COUNT\endlink (9999999)                                                |
 | Registered            | Properties registered using Dali::PropertyRegistration                                            | \link Dali::PROPERTY_REGISTRATION_START_INDEX PROPERTY_REGISTRATION_START_INDEX\endlink (10000000)         | \link Dali::PROPERTY_REGISTRATION_MAX_INDEX PROPERTY_REGISTRATION_MAX_INDEX\endlink (19999999)                                     |
-| Registered Animatable | Animatable properties registered using Dali::AnimatablePropertyRegistration                       | \link Dali::ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX\endlink (20000000) | \link Dali::ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX\endlink (29999999) |
-| Registered Child      | Child properties (which parent supports in its children) registered using Dali::ChildPropertyRegistration   | \link Dali::ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX\endlink (20000000) | \link Dali::CHILD_PROPERTY_REGISTRATION_MAX_INDEX CHILD_PROPERTY_REGISTRATION_MAX_INDEX\endlink (49999999) |
 | Control               | Property range reserved by Dali::Toolkit::Control                                                 | \link Dali::Toolkit::Control::CONTROL_PROPERTY_START_INDEX CONTROL_PROPERTY_START_INDEX\endlink (10000000) | \link Dali::Toolkit::Control::CONTROL_PROPERTY_END_INDEX CONTROL_PROPERTY_END_INDEX\endlink (10001000)                             |
 | Derived Control       | Property range for control deriving directly from Dali::Toolkit::Control                          | 10001001                                                                                                   | \link Dali::PROPERTY_REGISTRATION_MAX_INDEX PROPERTY_REGISTRATION_MAX_INDEX\endlink (19999999)                                     |
+| Registered Animatable | Animatable properties registered using Dali::AnimatablePropertyRegistration                       | \link Dali::ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX\endlink (20000000) | \link Dali::ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX\endlink (29999999) |
+| Registered Child      | Child properties (which parent supports in its children) registered using Dali::ChildPropertyRegistration   | \link Dali::CHILD_PROPERTY_REGISTRATION_START_INDEX CHILD_PROPERTY_REGISTRATION_START_INDEX\endlink (45000000) | \link Dali::CHILD_PROPERTY_REGISTRATION_MAX_INDEX CHILD_PROPERTY_REGISTRATION_MAX_INDEX\endlink (49999999) |
 | Custom                | Custom properties added to instance using Dali::Handle::RegisterProperty                          | \link Dali::PROPERTY_CUSTOM_START_INDEX PROPERTY_CUSTOM_START_INDEX\endlink (50000000)                     | Onwards...                                                                                                                         |
 
 <br>
@@ -214,8 +214,6 @@ Property lookup via index should always be used unless the indicies cannot be kn
 
 @clip{"properties.cpp", // C++ EXAMPLE, // C++ EXAMPLE END}
 
-Once run, a grid of buttons will appear. When a button is pressed, the unique number stored in the property (in this case the index) is displayed at the bottom of the screen.
-
 <br>
 <hr>
 @section property-use-example-js Property use in JavaScript

diff --git a/docs/content/shared-javascript-and-cpp-documentation/animation.md b/docs/content/shared-javascript-and-cpp-documentation/animation.md
index 0e927a6..f979870 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/animation.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/animation.md
@@ -75,7 +75,7 @@ void ExampleCallback( Animation& source )
   std::cout << "Animation has finished" << std::endl;
 }
 ...
-animation.FinishedSignal().Connect( ExampleCallback );
+animation.FinishedSignal().Connect( &ExampleCallback );
 ~~~
 
 ### Alpha Functions

diff --git a/docs/content/shared-javascript-and-cpp-documentation/fundamentals.md b/docs/content/shared-javascript-and-cpp-documentation/fundamentals.md
index cce3bd4..d341445 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/fundamentals.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/fundamentals.md
@@ -38,6 +38,7 @@ downwards**.  This is intended to be convenient when laying-out 2D views.
 ## Positioning Actors {#positioning-actors}
 
 An actor inherits its parent's position.  The relative position between the actor & parent is determined by 3 properties:
+
 1) ParentOrigin.  This Vector3 property defines a point within the parent actor's area.
 
 ![ ](../assets/img/parent-origin.png)
@@ -57,9 +58,9 @@ The default is "center", which can be visualized in 2D as (0.5, 0.5), but is act
 ![ ](../assets/img/actor-position.png)
 ![ ](actor-position.png)
 
-Therefore by default, an actors position is the distance between its center and the top-left corner of its parent.
+The default is (X = 0, Y = 0), so an actor placed directly without modifying the parent origin, anchor point or position would appear centred around the top left corner of its parent.
 
-An actor added directly to the stage with position (X = stageWidth*0.5, Y = stageHeight*0.5), would appear in the center of the screen.  Likewise an actor with position (X = actorWidth*0.5, Y = actorWidth*0.5), would appear at the top-left of the screen.
+An actor added directly to the stage with position (X = stageWidth*0.5, Y = stageHeight*0.5), would appear in the center of the screen.  Likewise an actor with position (X = actorWidth*0.5, Y = actorWidth*0.5), would appear at the top-left of the screen. However, basic positioning like that is normally done via changing the parent origin and/or anchor point instead - use ParentOrigin::CENTER and AnchorPoint::CENTER to place the actor in the center of the screen, and ParentOrigin::TOP_LEFT and AnchorPoint::TOP_LEFT to place it inside the screen on the top left.
 
 Note that since DALi is a 3D toolkit, this behaviour is the result of a default perspective camera setup.
 

diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec
index a4c57ed..38e6219 100644 (file)
--- a/packaging/dali-addon.spec
+++ b/packaging/dali-addon.spec
@@ -1,6 +1,6 @@
 Name:       dali-addon
 Summary:    DALi module for Node.JS
-Version:    1.2.6
+Version:    1.2.7
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index aa0cada..d094cf5 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.2.6
+Version:    1.2.7
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT

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 );