From: Francisco Santos Date: Mon, 27 Apr 2015 16:11:28 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/tizen' into devel/new_mesh X-Git-Tag: dali_1.0.47~13^2~32 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=030e7c680a6eb0e8d87bfdb8ec359a0267ef7db2 Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 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 --- 030e7c680a6eb0e8d87bfdb8ec359a0267ef7db2 diff --cc automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index 0d259d9,4b62045..b2f0324 --- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp @@@ -296,9 -295,9 +295,6 @@@ int UtcDaliPushButtonSetImages(void 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 --cc docs/content/programming-guide/size-negotiation.h index 2f64d83,92beacd..334c709 --- a/docs/content/programming-guide/size-negotiation.h +++ b/docs/content/programming-guide/size-negotiation.h @@@ -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) - Actor type: The type name of the actor E.g. PushButton - Actor name: The name set on the actor with SetName(). Useful for debugging. - Pos: The position of the actor