projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: cd7d41b 620ac79)
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 83/38783/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 27 Apr 2015 16:11:28 +0000 (17:11 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 27 Apr 2015 16:11:28 +0000 (17:11 +0100)
Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-Cluster.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
automated-tests/src/dali-toolkit/utc-Dali-View.cpp
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.h
dali-toolkit/internal/controls/cluster/cluster-impl.cpp
dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
dali-toolkit/internal/controls/scrollable/scrollable-impl.h
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.h
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.h
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/controls/view/view-impl.cpp
dali-toolkit/internal/controls/view/view-impl.h
dali-toolkit/internal/file.list
dali-toolkit/internal/text/clipping/text-clipper.cpp
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/decorator/text-decorator.h
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
dali-toolkit/internal/text/text-control-interface.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h
dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
dali-toolkit/public-api/controls/buttons/push-button.cpp
dali-toolkit/public-api/controls/cluster/cluster-style.cpp
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
dali-toolkit/public-api/controls/text-controls/text-field.cpp
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/view/view.h
dali-toolkit/public-api/dali-toolkit-version.cpp
docs/content/programming-guide/animation-example.h
docs/content/programming-guide/animation-rotation.h
docs/content/programming-guide/dynamics-bodies.h
docs/content/programming-guide/size-negotiation.h
packaging/dali-toolkit.spec
plugins/dali-script-v8/src/object/property-value-wrapper.cpp

Change-Id: I5a0a9bc20a55ebcc9605c24d9ce1e688f0e6b9cc

1  2 
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp patch | diff1 | diff2 | blob | history
docs/content/programming-guide/size-negotiation.h patch | diff1 | diff2 | blob | history

diff --combined automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 0d259d9,4b62045..b2f0324
--- 1/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@@ -287,8 -287,7 +287,7 @@@ int UtcDaliPushButtonSetImages(void
    application.SendNotification();
    application.Render();
  
-   // Just check if check box button size changes when a bigger image is set.
- 
+   pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
    pushButton.SetButtonImage( image01 );
  
    application.SendNotification();
@@@ -296,9 -295,9 +295,6 @@@
  
    size = pushButton.GetCurrentSize();
  
-   DALI_TEST_EQUALS( size.width, 10.f, TEST_LOCATION );
-   DALI_TEST_EQUALS( size.height, 10.f, TEST_LOCATION );
 -  DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
 -  DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
--
    END_TEST;
  }
  
diff --combined docs/content/programming-guide/size-negotiation.h
index 2f64d83,92beacd..334c709
--- 1/docs/content/programming-guide/size-negotiation.h
--- 2/docs/content/programming-guide/size-negotiation.h
+++ b/docs/content/programming-guide/size-negotiation.h
@@@ -45,11 -45,7 +45,7 @@@ This section details how an actor may b
  
  <h3>Enabling Size Negotiation</h3>
  
- The first thing to do is to specify whether you want an actor to be included or excluded from the relayout process. The following method is used to enable or disable the relayout
- for an individual actor. Make sure this is the first thing that is called after the actor is created otherwise the actor may still be negotiated.
- @code void SetRelayoutEnabled( bool enabled ) @endcode
- Text and image actors have relayout enabled by default, while a plain Actor is disabled. Be aware that if desiring to use an Actor in relayout
- then relayout needs to be explicitly enabled first.
+ Text and image actors have relayout enabled by default, while a plain Actor is disabled unless a call to SetResizePolicy is made.
  
  <h3>Specifying Size Policies</h3>
  
@@@ -69,7 -65,6 +65,6 @@@ the height of the root actor will fit t
  
  @code
  Actor rootActor = Actor::New();
- rootActor.SetRelayoutEnabled( true );
  rootActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
  rootActor.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
  ImageActor image = ImageActor::New( Image::New( MY_IMAGE_PATH ) );
@@@ -249,7 -244,7 +244,7 @@@ PushButton, OKAY_BUTTON - Pos: [185, 0
  
  The format is as follows:
  
--[Actor type], [Actor name] – Pos:[X, Y, Z] Size[Dimension::WIDTH, Dimension::HEIGHT, DEPTH], Dirty:(Dimension::WIDTH, Dimension::HEIGHT), Negotiated: (Dimension::WIDTH, Dimension::HEIGHT), Enabled: BOOLEAN, (Object address)
++[Actor type], [Actor name] ? Pos:[X, Y, Z] Size[Dimension::WIDTH, Dimension::HEIGHT, DEPTH], Dirty:(Dimension::WIDTH, Dimension::HEIGHT), Negotiated: (Dimension::WIDTH, Dimension::HEIGHT), Enabled: BOOLEAN, (Object address)
  - <i>Actor type</i>: The type name of the actor E.g. PushButton
  - <i>Actor name</i>: The name set on the actor with SetName(). Useful for debugging.
  - <i>Pos</i>: The position of the actor
Domain: Graphics System / DALi;