Adeel Kazmi [Fri, 29 May 2015 08:01:50 +0000 (09:01 +0100)]
[dali_1.0.42] Merge branch 'tizen'
Change-Id: I81fb21b7b5b152145b7baadb85f32249b4eaaf72
Adeel Kazmi [Fri, 29 May 2015 08:01:22 +0000 (09:01 +0100)]
DALi Version 1.0.42
Change-Id: If8093c032fcc65118732f8c6d6c2ae62271617de
Adeel Kazmi [Thu, 28 May 2015 19:53:23 +0000 (12:53 -0700)]
Merge "Add test case for ControlImpl::OnAccessibilityActivated" into tizen
Kimmo Hoikka [Thu, 28 May 2015 17:01:32 +0000 (10:01 -0700)]
Merge "TextField added to programming guide" into tizen
Richard Huang [Thu, 28 May 2015 16:50:57 +0000 (17:50 +0100)]
Add test case for ControlImpl::OnAccessibilityActivated
Change-Id: I642bf2da05b0dc7cebdb8a9cd10497b0336a0988
Kimmo Hoikka [Thu, 28 May 2015 16:27:00 +0000 (09:27 -0700)]
Merge "Fixed Control and Magnifier API" into tizen
Kimmo Hoikka [Thu, 28 May 2015 15:29:12 +0000 (08:29 -0700)]
Merge "Stagehand documentation" into tizen
Nick Holland [Wed, 27 May 2015 19:03:35 +0000 (20:03 +0100)]
Stagehand documentation
Change-Id: I927266c5a1e7817183f762d9c6534ae0aa8a7d8c
Adeel Kazmi [Thu, 28 May 2015 13:56:53 +0000 (06:56 -0700)]
Merge "Changed grab-handle behavior to work inside Popup" into tizen
Paul Wisbey [Thu, 28 May 2015 13:44:53 +0000 (06:44 -0700)]
Merge "Fix the cursor vertical position when there is no text." into tizen
Richard Huang [Thu, 28 May 2015 12:26:56 +0000 (13:26 +0100)]
Fixed Control and Magnifier API
Change-Id: I0cdf52157b2c4633d0710b37666d1b714e816859
Paul Wisbey [Thu, 28 May 2015 10:32:49 +0000 (11:32 +0100)]
TextField added to programming guide
Change-Id: Ie18cd6207235b8b731fd593b0697745075b75f95
Kimmo Hoikka [Thu, 28 May 2015 11:07:01 +0000 (12:07 +0100)]
Fix Control test coverage
Change-Id: I0eb8c0b8998318701fd6d290f652e7e31288de69
Kimmo Hoikka [Thu, 28 May 2015 09:59:01 +0000 (02:59 -0700)]
Merge "Update contents of programming guide" into tizen
Paul Wisbey [Fri, 22 May 2015 15:28:50 +0000 (16:28 +0100)]
Changed grab-handle behavior to work inside Popup
Change-Id: I4b94b37b3f4c00f74d67a3429868753cd1b347e3
Victor Cebollada [Thu, 28 May 2015 08:01:00 +0000 (09:01 +0100)]
Fix the cursor vertical position when there is no text.
Change-Id: I41f58f13d50528266974cc78b974eebdcc9e08f3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 26 May 2015 14:31:51 +0000 (15:31 +0100)]
MultiLanguage support - Fix for font validation.
The cache for the valid fonts per script is resized with the number of
supported scripts. Can not use the PushBack() as there is already space
for the item.
Change-Id: I024b112abc523adb7e9f185b1fd4c70f4ff8d060
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 26 May 2015 17:23:13 +0000 (18:23 +0100)]
Update contents of programming guide
Change-Id: I36b3fa9c2de0874d5589f027c0d46213574a1075
Adeel Kazmi [Wed, 27 May 2015 17:18:09 +0000 (10:18 -0700)]
Merge "Change ItemFactory destructor to be not pure virtual" into tizen
Xiangyin Ma [Wed, 27 May 2015 15:30:28 +0000 (16:30 +0100)]
Quick fix of Popup after removing PropagateRelayoutFlags()
Change-Id: Idbf57f6cf3e4e2e80a1e9aed2748ccb83685d7d2
Richard Huang [Wed, 27 May 2015 15:59:23 +0000 (16:59 +0100)]
Change ItemFactory destructor to be not pure virtual
Change-Id: I171fda6c72a9ec33bb16406fb873d5c6d07c72ad
Adeel Kazmi [Wed, 27 May 2015 15:40:27 +0000 (08:40 -0700)]
Merge "Internal::Control cleanup, remove dead an non-needed methods and adding missing test cases" into tizen
Agnelo Vaz [Tue, 26 May 2015 18:30:16 +0000 (19:30 +0100)]
Call VirtualKeyboard ApplySettings
Change-Id: Ifda2e86b719cc8cc8af266b556ef80027d79bc8d
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Kimmo Hoikka [Wed, 27 May 2015 14:50:43 +0000 (15:50 +0100)]
Internal::Control cleanup, remove dead an non-needed methods and adding missing test cases
Change-Id: I0813ca3299910b911cde165892638048b905c86a
Kimmo Hoikka [Wed, 27 May 2015 10:35:38 +0000 (03:35 -0700)]
Merge "(ItemFactory) Add GetExtension" into tizen
Kimmo Hoikka [Wed, 27 May 2015 09:47:23 +0000 (02:47 -0700)]
Merge "Fix size negotiation for ScrollBar" into tizen
Adeel Kazmi [Tue, 26 May 2015 18:27:42 +0000 (11:27 -0700)]
Merge "Empty Implementation for INPUT_METHOD_SETTINGS property" into tizen
Adeel Kazmi [Tue, 26 May 2015 18:15:28 +0000 (19:15 +0100)]
(ItemFactory) Add GetExtension
Change-Id: I6c6be97dde2ee285e2947000b4be2cd5d80c53d8
Adeel Kazmi [Tue, 26 May 2015 17:34:43 +0000 (10:34 -0700)]
Merge "Changes after Custom actor impl extension, cleanup, extension and test cases for Internal::Control" into tizen
Richard Huang [Tue, 26 May 2015 16:25:44 +0000 (17:25 +0100)]
Fix size negotiation for ScrollBar
Change-Id: I1a645b3fb95910761c2c7b9df2b00450a650dc81
Kimmo Hoikka [Tue, 26 May 2015 16:22:05 +0000 (17:22 +0100)]
Changes after Custom actor impl extension, cleanup, extension and test cases for Internal::Control
Change-Id: I0bc19a5bd6bfff6c087d0edb949e08ef63dace3b
Richard Huang [Tue, 26 May 2015 16:06:44 +0000 (17:06 +0100)]
Update UTC for TableView
Change-Id: I01ff59952592959dd53cdcd8a18fbe72f4929b41
Kimmo Hoikka [Tue, 26 May 2015 15:42:34 +0000 (08:42 -0700)]
Merge "Update UTC for ItemView, ScrollView and FocusManager" into tizen
Paul Wisbey [Tue, 26 May 2015 14:28:30 +0000 (07:28 -0700)]
Merge "Move TextSelectionPopup from public to devel" into tizen
Agnelo Vaz [Tue, 26 May 2015 12:45:15 +0000 (13:45 +0100)]
Move TextSelectionPopup from public to devel
Change-Id: I67ed206d8083606ba5435c502e668414095bd9dc
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Richard Huang [Tue, 26 May 2015 13:20:34 +0000 (14:20 +0100)]
Update UTC for ItemView, ScrollView and FocusManager
Change-Id: I90ccadcba919af94d41d56d0a830db8568aa34f7
Agnelo Vaz [Fri, 22 May 2015 13:00:13 +0000 (14:00 +0100)]
Empty Implementation for INPUT_METHOD_SETTINGS property
Change-Id: Idfe0b6614a1d10c7b993304c571517e3575dee71
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Tue, 26 May 2015 09:52:10 +0000 (10:52 +0100)]
Remove MaskedImageView
Change-Id: I1a4dcec6a89c2a57126d2568bb55ac6cb07bc625
HyunJu Shin [Mon, 25 May 2015 08:41:14 +0000 (01:41 -0700)]
Merge "Add utc test cases" into tizen
HyunJu Shin [Mon, 25 May 2015 08:35:27 +0000 (01:35 -0700)]
Merge "Add UTCs for TextSelectionPopup" into tizen
Yoonsang Lee [Mon, 25 May 2015 07:48:41 +0000 (16:48 +0900)]
Update TableView utc
- Add UtcDaliTableViewCtorCopyP
- Add UtcDaliTableViewMetricsFit
Change-Id: I334db04227c4a028bb7328fc94f91f563fb74cb0
Heeyong Song [Mon, 25 May 2015 08:02:25 +0000 (17:02 +0900)]
Add utc test cases
Change-Id: I304442fbcbc4930b760920809e09e4f859645b47
taeyoon [Mon, 25 May 2015 07:04:41 +0000 (16:04 +0900)]
Add UTCs for TextSelectionPopup
Change-Id: If9b62e43889434d0ca3b3a398cbc657a9b6f2dad
Kimmo Hoikka [Fri, 22 May 2015 18:16:21 +0000 (11:16 -0700)]
Merge "Update with the change of Orientation in adaptor" into tizen
Xiangyin Ma [Fri, 22 May 2015 16:15:06 +0000 (17:15 +0100)]
Update with the change of Orientation in adaptor
Change-Id: Id6aa50da7c562a02956bf044993d7ac7a3417d33
Adeel Kazmi [Fri, 22 May 2015 16:08:47 +0000 (17:08 +0100)]
Changes after converting StyleChange to an enum
Change-Id: Ibfcb33744bf8dc9b6cc7dbcf0bc5097e6ae25f8a
Kimmo Hoikka [Fri, 22 May 2015 15:33:28 +0000 (08:33 -0700)]
Merge "Added more test cases for ScrollView" into tizen
Adeel Kazmi [Fri, 22 May 2015 15:20:52 +0000 (08:20 -0700)]
Merge "Avoid overwriting TEXT with PLACEHOLDER_TEXT" into tizen
Richard Huang [Fri, 22 May 2015 14:43:05 +0000 (15:43 +0100)]
Added more test cases for ScrollView
Change-Id: I5958113e9032139da7fcf03a31b5eec859fd2a28
Paul Wisbey [Fri, 22 May 2015 13:51:58 +0000 (14:51 +0100)]
Avoid overwriting TEXT with PLACEHOLDER_TEXT
Change-Id: I679d9a8a1ea72d28f45897accc8c3051b85e938b
Victor Cebollada [Fri, 22 May 2015 09:20:25 +0000 (10:20 +0100)]
Cursor Alignment.
Aligns the cursor according the horizontal alignment if there is no text.
Change-Id: Ib32c6f3ccc529d593341a82edd19c7e63637f41f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Thu, 21 May 2015 18:01:39 +0000 (11:01 -0700)]
Merge "INPUT_METHOD_SETTINGS Property added to TextField" into tizen
Agnelo Vaz [Thu, 21 May 2015 16:50:57 +0000 (17:50 +0100)]
INPUT_METHOD_SETTINGS Property added to TextField
Change-Id: I249d0fa464c504b0629af1b5e6611aa138badb80
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Lee Morgan [Fri, 15 May 2015 15:42:50 +0000 (16:42 +0100)]
Removed button factories
Change-Id: Ie3b73e6a71fbc563318e80db53687a60987897c2
Kimmo Hoikka [Thu, 21 May 2015 16:46:04 +0000 (09:46 -0700)]
Merge "(TableView) Move from devel-api to public-api" into tizen
Kimmo Hoikka [Thu, 21 May 2015 16:28:19 +0000 (09:28 -0700)]
Merge "(AutomatedTests) Ensure local headers are included before installed" into tizen
Adeel Kazmi [Thu, 21 May 2015 15:03:22 +0000 (16:03 +0100)]
(TableView) Move from devel-api to public-api
Change-Id: I0944b508cf4ccbb71e57fd2f28ddd9e598a8e082
Richard Huang [Thu, 21 May 2015 14:20:05 +0000 (15:20 +0100)]
Added test cases for ScrollView
Change-Id: I6b36ebf13961ebfd5cc7fba0bbc0d567ee717cad
Adeel Kazmi [Thu, 21 May 2015 14:32:21 +0000 (15:32 +0100)]
(AutomatedTests) Ensure local headers are included before installed
Change-Id: I64b8c1483842920d6e16fb072b0a0150bfd1ba7c
Adeel Kazmi [Thu, 21 May 2015 09:36:57 +0000 (02:36 -0700)]
Merge "Move illegal file access from style manager to adaptor" into tizen
Nick Holland [Fri, 15 May 2015 16:07:06 +0000 (17:07 +0100)]
Add Extension to control-impl.h
Change-Id: I152a0e91092461fa836382c2c72a6533c34e781d
Kimmo Hoikka [Wed, 20 May 2015 14:13:08 +0000 (15:13 +0100)]
Move illegal file access from style manager to adaptor
Change-Id: I6a6e4453889bc905b782affb5be3c15508f54ba2
Agnelo Vaz [Wed, 20 May 2015 13:14:07 +0000 (14:14 +0100)]
TextField MaxLengthReachedSignal Tests added
Change-Id: Ia673454cc352c8dee0bdfc891b0c36ea469750bd
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Paul Wisbey [Tue, 19 May 2015 13:38:57 +0000 (06:38 -0700)]
Merge "Use stylesheet from StyleMonitor" into tizen
Paul Wisbey [Mon, 18 May 2015 15:17:33 +0000 (16:17 +0100)]
Use stylesheet from StyleMonitor
Change-Id: I51cfb2b1f4b7eb7a20e4236079156b203a50a947
Kimmo Hoikka [Mon, 18 May 2015 17:04:43 +0000 (18:04 +0100)]
Cleaning up size negotiation
- Remove unnecassary data from control
- Make control use its background for natural size
- Use base helpers for width for height and height for width
Change-Id: I690406eac2e51ca696e61d23d7117aaef10b3022
Nick Holland [Mon, 18 May 2015 10:49:07 +0000 (11:49 +0100)]
Move more public-api headers to devel-api. PART 3
Removed the following headers from public-api and moved into devel-api
public-api/builder/builder.h
public-api/builder/json-parser.h
public-api/builder/tree-node.cpp
public-api/builder/tree-node.h
public-api/controls/bloom-view/bloom-view.h
public-api/controls/bubble-effect/bubble-emitter.h
public-api/controls/effects-view/effects-view.h
public-api/controls/magnifier/magnifier.h
public-api/controls/page-turn-view/page-factory.h
public-api/controls/page-turn-view/page-turn-landscape-view.h
public-api/controls/page-turn-view/page-turn-portrait-view.h
public-api/controls/page-turn-view/page-turn-view.h
public-api/controls/popup/popup.h
public-api/controls/shadow-view/shadow-view.h
public-api/controls/slider/slider.cpp
public-api/controls/slider/slider.h
public-api/controls/super-blur-view/super-blur-view.h
public-api/controls/table-view/table-view.h
public-api/controls/tool-bar/tool-bar.h
public-api/scripting/script-plugin.h
public-api/scripting/script.h
public-api/shader-effects/alpha-discard-effect.h
public-api/shader-effects/bendy-effect.h
public-api/shader-effects/blind-effect.h
public-api/shader-effects/bouncing-effect.h
public-api/shader-effects/bubble-effect/bubble-effect.h
public-api/shader-effects/bubble-effect/color-adjuster.h
public-api/shader-effects/carousel-effect.h
public-api/shader-effects/displacement-effect.h
public-api/shader-effects/dissolve-effect.h
public-api/shader-effects/dissolve-local-effect.h
public-api/shader-effects/distance-field-effect.h
public-api/shader-effects/image-region-effect.h
public-api/shader-effects/iris-effect.h
public-api/shader-effects/mask-effect.h
public-api/shader-effects/mirror-effect.h
public-api/shader-effects/motion-blur-effect.h
public-api/shader-effects/motion-stretch-effect.h
public-api/shader-effects/nine-patch-mask-effect.h
public-api/shader-effects/overlay-effect.h
public-api/shader-effects/page-turn-book-spine-effect.h
public-api/shader-effects/page-turn-effect.h
public-api/shader-effects/quadratic-bezier.h
public-api/shader-effects/ripple-effect.h
public-api/shader-effects/ripple2d-effect.h
public-api/shader-effects/shear-effect.h
public-api/shader-effects/soft-button-effect.h
public-api/shader-effects/spot-effect.h
public-api/shader-effects/square-dissolve-effect.h
public-api/shader-effects/swirl-effect.h
public-api/shader-effects/water-effect.h
public-api/styling/style-manager.h
public-api/transition-effects/cube-transition-cross-effect.h
public-api/transition-effects/cube-transition-effect.h
public-api/transition-effects/cube-transition-fold-effect.h
public-api/transition-effects/cube-transition-wave-effect.h
Change-Id: I11a7cc81903ec6d1919b50d7310b9316279c51e5
Paul Wisbey [Sun, 17 May 2015 10:54:34 +0000 (03:54 -0700)]
Merge "Fix for cursor. Avoid the jump of the grab handle when there is a mix of rtl and ltr text." into tizen
Nick Holland [Fri, 15 May 2015 14:41:33 +0000 (15:41 +0100)]
Move more public-api headers to devel-api. PART 2
Support for changes to dali-core header files
Change-Id: I8e66c9bcfdd314d9c1901f4d3fbb7d0411cb92b1
Victor Cebollada [Thu, 7 May 2015 15:06:33 +0000 (16:06 +0100)]
Fix for cursor.
Avoid the jump of the grab handle when there is a mix of rtl and ltr text.
Change-Id: I04a72452ab2cd1d2289c669bbf19b653abbba042
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Nick Holland [Mon, 11 May 2015 13:57:11 +0000 (14:57 +0100)]
Added support for including headers from devel folder
Change-Id: I482ab3160fb783a4623e2abf3417ece9fabc7572
Adeel Kazmi [Fri, 15 May 2015 09:22:04 +0000 (02:22 -0700)]
Merge "Added PathConstrainer and LinearConstrainer support to builder" into tizen
Ferran Sole [Mon, 13 Apr 2015 15:02:37 +0000 (16:02 +0100)]
Added PathConstrainer and LinearConstrainer support to builder
constrainers are defined like this
"constrainers":
{
"constrainer0":
{
"type":"PathConstrainer",
"points":[[100.0, 500.0, 0.0],[400.0, 500.0, 0.0]] ,
"control-points":[[200.0, 100.0, 0.0],[300.0, 100.0, 0.0]],
"forward":[1.0,0.0,0.0]
},
"constrainer1":
{
"type":"LinearConstrainer",
"values":[0,400,200,0],
"progress":[0.0,0.25,0.75,1.0]
}
}
And they can be applied or remove using signals like this:
...
"signals":
[
{
"name": "on-stage",
"action": "applyConstraint",
"constrainer": "constrainer0",
"properties":
[
{
"target":"targetActor",
"targetProperty":"position",
"source":"sourceActor",
"sourceProperty":"position-y",
"range":[-120.0,300.0]
},
{
"target":"targetActor",
"targetProperty":"orientation",
"source":"sourceActor",
"sourceProperty":"position-y",
"range":[-120.0,300.0]
}
]
},
...
{
"name": "touched",
"action": "removeConstraints",
"constrainer": "constrainer0",
"properties":
[
{
"target":"targetActor"
}
]
}
Change-Id: I182c5ac2ad53f36fcb17bdcde6c47b9facf12bf0
Ferran Sole [Thu, 14 May 2015 13:43:06 +0000 (14:43 +0100)]
Removed unused scroll-view effects
Change-Id: Ie176262c8ee25c43674632d3802e442041696c77
Kimmo Hoikka [Thu, 14 May 2015 15:37:42 +0000 (08:37 -0700)]
Merge "Added PropertyValue Array as a class" into tizen
Lee Morgan [Tue, 12 May 2015 14:42:52 +0000 (15:42 +0100)]
Added PropertyValue Array as a class
Change-Id: I84de3a7feee2f19a2464a07be25859faefc26059
Richard Huang [Thu, 14 May 2015 10:23:34 +0000 (11:23 +0100)]
Fix anchor animation in ItemView and disable anchoring by default
Change-Id: I948bd793a754b88e72545a8a7821bd5ddcced839
Adeel Kazmi [Mon, 11 May 2015 17:15:27 +0000 (18:15 +0100)]
Refactored Item Layouts
- Removed boost::function usage
- DepthLayout, GridLayout & SpiralLayout removed from Public API
- Added a helper API to create the default layouts using an ENUM
- Reworked the constraints in each layout
- Removed automatic animations between layouts (broken anyway)
- Added future extension to ItemLayout
Change-Id: I3265f190eccd8396d689d6f74c5e70cc8905c744
Richard Huang [Thu, 7 May 2015 10:50:41 +0000 (11:50 +0100)]
ScrollBar refactoring
1. Removed ScrollComponent and ScrollConnector
2. Further cleaned up Scollable public API
3. Refactored ScrollBar control to accept scroll position properties from customized property sources
4. Changed scroll position properties in ScrollView from Vector3 to Vector2
5. Harmonized ScrollView and ItemView to support the same new ScrollBar control
For example, to add a vertical scroll bar to ScrollView:
mScrollBarVertical = ScrollBar::New(Toolkit::ScrollBar::Vertical);
mScrollBarVertical.SetParentOrigin(ParentOrigin::TOP_RIGHT);
mScrollBarVertical.SetAnchorPoint(AnchorPoint::TOP_RIGHT);
mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT);
mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH);
mScrollView.Add(mScrollBarVertical);
Change-Id: Icf61530a64585f3edc1fa33022877923414500f2
Adeel Kazmi [Wed, 13 May 2015 15:57:55 +0000 (08:57 -0700)]
Merge "Added scroll view page path effect. Allows creating new scroll view effects for pages on a scrollview using a path. Removed ScrollViewPageCubeEffect, ScrollViewPageCarouselEffect and ScrollViewPageSpiralEffect which can be easily implemented using new scrollview path effect." into tizen
Ferran Sole [Wed, 6 May 2015 08:22:14 +0000 (09:22 +0100)]
Added scroll view page path effect.
Allows creating new scroll view effects for pages on a scrollview
using a path.
Removed ScrollViewPageCubeEffect, ScrollViewPageCarouselEffect and ScrollViewPageSpiralEffect
which can be easily implemented using new scrollview path effect.
Change-Id: Iabc4cef2dc810466def5b12846e451b46710ecb9
Victor Cebollada [Fri, 8 May 2015 09:38:30 +0000 (10:38 +0100)]
Text Layout - Ellipsis the text when exceeds the boundaries of the box.
Change-Id: I70d5be413e080bc75a0a9505736cc4170a1b69be
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Nick Holland [Tue, 12 May 2015 17:24:26 +0000 (18:24 +0100)]
Remove use of ActorContainer
Also removed some unnecessary includes of <vector-wrapper.h> from
public-api files
Change-Id: I226fc94568e73231ad52e7db52b12328688e8881
Ferran Sole [Fri, 10 Apr 2015 10:11:00 +0000 (11:11 +0100)]
PathConstrainer changes in JS Plugin + LinearConstrainer
Sample code showing how to use PathConstrainer in Javascript:
var pathConstrainer = new dali.PathConstrainer();
pathConstrainer.points = [ point0, point1, point2 ];
pathConstrainer.controlPoints = [ controlPoint0, controlPoint1, controlPoint2, controlPoint3 ];
pathConstrainer.forward = [1.0,0.0,0.0];
var constraintPosition = {
"target":actor,
"targetProperty":"position",
"source":actor,
"sourceProperty":"color-alpha",
"range":[0.0,1.0]
};
pathConstrainer.applyConstraint( constraintPosition );
Change-Id: If5c5aee0d402b5c689b983a9848648d6700dec6b
Adeel Kazmi [Tue, 12 May 2015 15:21:03 +0000 (08:21 -0700)]
Merge "Remove navigation frame control" into tizen
Kimmo Hoikka [Tue, 12 May 2015 15:14:25 +0000 (08:14 -0700)]
Merge "Reduce ImageActor & RenderableActor APIs" into tizen
Nick Holland [Tue, 12 May 2015 13:14:53 +0000 (14:14 +0100)]
Remove navigation frame control
Change-Id: Ice4b22f3153f2e4a4c7ae98debfa223cee9d8b1b
Kimmo Hoikka [Tue, 12 May 2015 12:49:58 +0000 (13:49 +0100)]
Remove dependency to std::vector and property::value from property notification API
Change-Id: I606e7860fcc8c8ea1cc1cc38db2961b56a12870d
Yoonsang Lee [Tue, 12 May 2015 01:07:14 +0000 (10:07 +0900)]
Reduce ImageActor & RenderableActor APIs
- Remove ImageActor::IsPixelAreaSet(), ClearPixelArea()
- Remove RenderableActor::SetBlendFunc(), SetBlendEquation(), GetBlendEquation(), SetBlendColor(), GetBlendColor()
Change-Id: I3d13dd7450338380197361ecae2859f0fec78988
Adeel Kazmi [Mon, 11 May 2015 14:44:19 +0000 (15:44 +0100)]
Fix version issues with 1.0.41
Change-Id: If96da7e6d6e0d36db3f9f34a0cdb016217758fea
Nick Holland [Wed, 6 May 2015 10:59:48 +0000 (11:59 +0100)]
Added more shared C++/JavaScript documentation
TextLabel, script-hello, dali-fundamentals converted to markdown and
shared with JavaScript.
Removed all references to TextActor
Added JavaScript examples to JSON specification and moved to shared C++/
Javascript folder
Replaced main DALi screenshot image with screen grabs from current dali-demo
Change-Id: Iaf4b56c6a0e34356e8891e1b4cb3fbc1fdef0587
Kimmo Hoikka [Fri, 8 May 2015 15:08:18 +0000 (08:08 -0700)]
Merge "IMF event fixes" into tizen
Paul Wisbey [Fri, 8 May 2015 14:30:50 +0000 (07:30 -0700)]
Merge "Revert "DALi Version 1.0.41"" into tizen
Nick Holland [Fri, 8 May 2015 14:27:56 +0000 (07:27 -0700)]
Revert "DALi Version 1.0.41"
This reverts commit
541c8417421eec40c1bf6c7e2fca0e668b6369f3.
Change-Id: I4a6ae1a24bbbf722657fcdf3c6abb4d80a77a6f3
Paul Wisbey [Fri, 8 May 2015 14:17:18 +0000 (07:17 -0700)]
Merge "DALi Version 1.0.41" into tizen
Nick Holland [Fri, 8 May 2015 13:05:18 +0000 (14:05 +0100)]
[dali_1.0.41] Merge branch 'tizen'
Change-Id: Ib38aa28f8520bb2bd492ff1ac07fbee92ba9ef16
Nick Holland [Fri, 8 May 2015 13:00:25 +0000 (14:00 +0100)]
DALi Version 1.0.41
Change-Id: Ia38edc3f527bad772130fa750f06eab405b039b1
Nick Holland [Fri, 8 May 2015 12:52:29 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: Ia38edc3f527bad772130fa750f06eab405b039b1
Paul Wisbey [Thu, 7 May 2015 12:22:12 +0000 (13:22 +0100)]
IMF event fixes
Change-Id: Ide705ec18a46ded7fd770b20ce3752446e8c7f7d
Victor Cebollada [Fri, 8 May 2015 08:15:30 +0000 (09:15 +0100)]
TextLayout - Wrap a word by character if it doesn't fit.
Change-Id: I73c2005e0fab4ce538248ca0c428803096fce460
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>