platform/core/uifw/dali-toolkit.git
9 years agoMerge "Added TextLabel and TextField tests" into tizen
Paul Wisbey [Tue, 14 Apr 2015 12:05:20 +0000 (05:05 -0700)]
Merge "Added TextLabel and TextField tests" into tizen

9 years agoMerge "Size negotiation patch 3: Scope size negotiation enums" into tizen
Kimmo Hoikka [Tue, 14 Apr 2015 10:52:41 +0000 (03:52 -0700)]
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen

9 years agoAdded TextLabel and TextField tests 46/38146/4
Richard Underhill [Mon, 13 Apr 2015 15:08:45 +0000 (16:08 +0100)]
Added TextLabel and TextField tests

Change-Id: I8ac0c4479f87cf6ac4ee20a7e50f7d091b60c2d0
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Layout fixes" into tizen
Paul Wisbey [Tue, 14 Apr 2015 10:26:58 +0000 (03:26 -0700)]
Merge "Layout fixes" into tizen

9 years agoMerge "TextLayout - Use one method to do the single line or multi-line layout." into...
Paul Wisbey [Tue, 14 Apr 2015 10:26:46 +0000 (03:26 -0700)]
Merge "TextLayout - Use one method to do the single line or multi-line layout." into tizen

9 years agoLayout fixes 36/38136/3
Victor Cebollada [Thu, 9 Apr 2015 10:21:19 +0000 (11:21 +0100)]
Layout fixes

Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: I67c7630438655ea72940a70e764ae214267122be

9 years agoTextLayout - Use one method to do the single line or multi-line layout. 33/38133/2
Victor Cebollada [Thu, 9 Apr 2015 16:24:02 +0000 (17:24 +0100)]
TextLayout - Use one method to do the single line or multi-line layout.

Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: Iec3bd2c60a2d3c36f2a13f16b2e7ce77dedaa336

9 years agoSize negotiation patch 3: Scope size negotiation enums 48/38148/1
Kingsley Stephens [Fri, 10 Apr 2015 09:24:06 +0000 (10:24 +0100)]
Size negotiation patch 3: Scope size negotiation enums

Change-Id: I3fecc8c0ae631da45f474c64e9138b29cf5e71d1

9 years agoFix compile errors after removing boost function include from dali-core 43/38143/2
Nick Holland [Mon, 13 Apr 2015 14:33:30 +0000 (15:33 +0100)]
Fix compile errors after removing boost function include from dali-core

Change-Id: Ie62e653b1b37d71326365fd9992955a3ce622fe5

9 years agoRemoved some accidentally exported symbols 16/38116/2
Paul Wisbey [Mon, 13 Apr 2015 10:06:21 +0000 (11:06 +0100)]
Removed some accidentally exported symbols

Change-Id: I254cbe601f67609db21dd9432e402f00e93ef23e

9 years agoRemove mention of boost and textview from custom actor programming guide chapter 18/38118/1
Kimmo Hoikka [Mon, 13 Apr 2015 10:25:49 +0000 (11:25 +0100)]
Remove mention of boost and textview from custom actor programming guide chapter

Change-Id: Ideaa3e756edb959d393c907fd1940351493f0883

9 years agoMerge "DALi Version 1.0.37" into tizen
Kimmo Hoikka [Fri, 10 Apr 2015 14:52:11 +0000 (07:52 -0700)]
Merge "DALi Version 1.0.37" into tizen

9 years agoDALi Version 1.0.37 80/38080/1
Kingsley Stephens [Fri, 10 Apr 2015 14:35:36 +0000 (15:35 +0100)]
DALi Version 1.0.37

Change-Id: Ibb3c9c46178f2ded0ca6fa074d25cbb013d64c40

9 years agoFix button label centering of text 21/38021/3
Kingsley Stephens [Thu, 9 Apr 2015 15:14:57 +0000 (16:14 +0100)]
Fix button label centering of text

Change-Id: I4ca6860c96854fc10f671f89a254b73f861d9f0f

9 years agoMerge branch 'new_text' into tizen 33/38033/2
Paul Wisbey [Thu, 9 Apr 2015 16:55:24 +0000 (17:55 +0100)]
Merge branch 'new_text' into tizen

Change-Id: Iecbf9000e282e0eda6240c4895f9d25a1bbb6c41

9 years agoMerge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metri...
Paul Wisbey [Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)]
Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics and rounded up font metrics to simulate EFL behavior"" into new_text

9 years agoRevert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics... 32/38032/1
Paul Wisbey [Thu, 9 Apr 2015 16:51:52 +0000 (09:51 -0700)]
Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics and rounded up font metrics to simulate EFL behavior"

This reverts commit 52117490d94d8242addbe1608efe64364fdb308a.

Change-Id: I7e078755ae7cd90bfc9dab3325f76a10cf790b49

9 years agoDon't use String::EMPTY 31/38031/1
Paul Wisbey [Thu, 9 Apr 2015 16:35:24 +0000 (17:35 +0100)]
Don't use String::EMPTY

Change-Id: I4081a50f88b646c728c50987142c5cb22acdfc01

9 years agoMerge changes I26f3edb0,Iba714851 into new_text
Paul Wisbey [Thu, 9 Apr 2015 15:43:18 +0000 (08:43 -0700)]
Merge changes I26f3edb0,Iba714851 into new_text

* changes:
  Removed a float equality comparision
  Merge remote-tracking branch 'origin/tizen' into new_text

9 years agoMerge "Size negotiation patch 2: Re-enable size negotiation on builder actors." into...
Adeel Kazmi [Thu, 9 Apr 2015 15:02:21 +0000 (08:02 -0700)]
Merge "Size negotiation patch 2: Re-enable size negotiation on builder actors." into tizen

9 years agoAdded UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics and rounded... 42/37942/5
Richard Underhill [Thu, 9 Apr 2015 13:05:12 +0000 (14:05 +0100)]
Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics and rounded up font metrics to simulate EFL behavior

Change-Id: I52dbf0d609716e6d2e18de22cbc8489a67abaef3
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoRemoved a float equality comparision 17/38017/1
Paul Wisbey [Thu, 9 Apr 2015 13:35:59 +0000 (14:35 +0100)]
Removed a float equality comparision

Change-Id: I26f3edb02c3f7efaa0c92bb6878a664fc03c2a9b

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 10/38010/1
Paul Wisbey [Thu, 9 Apr 2015 12:21:16 +0000 (13:21 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: Iba714851799e17a461ac18d8431204835675c67b

9 years agoFix for slider labels 03/38003/1
Paul Wisbey [Thu, 9 Apr 2015 10:51:13 +0000 (11:51 +0100)]
Fix for slider labels

Change-Id: I76a87d300299358540216a5424bae9f29316ed75

9 years agoSize negotiation patch 2: Re-enable size negotiation on builder actors. 35/37935/2
Kingsley Stephens [Wed, 8 Apr 2015 13:12:14 +0000 (14:12 +0100)]
Size negotiation patch 2: Re-enable size negotiation on builder actors.

Fix bug in resizing table view

Change-Id: If423207d24823047303ccc054df2e2edd8f83afa

9 years agoCalculate the cursor position. 41/37641/6
Victor Cebollada [Mon, 30 Mar 2015 15:49:06 +0000 (16:49 +0100)]
Calculate the cursor position.

Change-Id: I074004e23dd12df6238aa244e123f28803372b0c
Signed-off-by: Victor Cebollada <v.cebollada@ws-1152.seri.co.uk>
9 years agoPushButton to use container Actor size not just ImageActors added to it 76/37876/4
Agnelo Vaz [Tue, 7 Apr 2015 15:17:07 +0000 (16:17 +0100)]
PushButton to use container Actor size not just ImageActors added to it

Change-Id: Ie8ca930bd6d9fb7ce7f4c232342bbdf38f8c7783
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "Move FontDefaults Declaration/Definition as it's needed by the TextInput....
Paul Wisbey [Thu, 9 Apr 2015 10:00:46 +0000 (03:00 -0700)]
Merge "Move FontDefaults Declaration/Definition as it's needed by the TextInput." into new_text

9 years agoMerge "Distinguish the cursor height and line height." into new_text
Paul Wisbey [Thu, 9 Apr 2015 09:54:41 +0000 (02:54 -0700)]
Merge "Distinguish the cursor height and line height." into new_text

9 years agoMerge "Calculate the visual to logical cursor position conversion table." into new_text
Paul Wisbey [Thu, 9 Apr 2015 09:54:11 +0000 (02:54 -0700)]
Merge "Calculate the visual to logical cursor position conversion table." into new_text

9 years agoMerge "GetLineOfGlyph() and GetLineOfCharacter() methods added to the visual model...
Paul Wisbey [Thu, 9 Apr 2015 09:52:48 +0000 (02:52 -0700)]
Merge "GetLineOfGlyph() and GetLineOfCharacter() methods added to the visual model.   To be used in the character selection." into new_text

9 years agoMerge "Use the line ascender and descender." into new_text
Paul Wisbey [Thu, 9 Apr 2015 09:50:34 +0000 (02:50 -0700)]
Merge "Use the line ascender and descender." into new_text

9 years agoMerge "Add the paragraph's direction to all lines." into new_text
Paul Wisbey [Thu, 9 Apr 2015 09:49:33 +0000 (02:49 -0700)]
Merge "Add the paragraph's direction to all lines." into new_text

9 years agoUsing New Constraints 72/37872/3
Adeel Kazmi [Tue, 7 Apr 2015 14:36:00 +0000 (15:36 +0100)]
Using New Constraints

 - ItemView: Use an animation instead of the constraint weight
 - Changes following new constraints

Change-Id: I6b61f69751288d7bbd1dc01ba1c190a4a917e33f

9 years agoTCT fixes 06/37906/3
Paul Wisbey [Wed, 8 Apr 2015 08:21:57 +0000 (09:21 +0100)]
TCT fixes

Change-Id: I9937b263589b8fbd640a268a91b50d7c840457ba

9 years agoMove FontDefaults Declaration/Definition as it's needed by the TextInput. 40/37940/1
Victor Cebollada [Wed, 8 Apr 2015 13:19:21 +0000 (14:19 +0100)]
Move FontDefaults Declaration/Definition as it's needed by the TextInput.

Change-Id: I61e79c35bf4eb6acf60ac641628719fbd20d1aea
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoDistinguish the cursor height and line height. 00/37600/3
Victor Cebollada [Tue, 31 Mar 2015 13:01:47 +0000 (14:01 +0100)]
Distinguish the cursor height and line height.

Change-Id: I6f49a278a836e1b08cb8dc03cbc9c8d490009dee
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoCalculate the visual to logical cursor position conversion table. 99/37599/3
Victor Cebollada [Tue, 31 Mar 2015 12:50:48 +0000 (13:50 +0100)]
Calculate the visual to logical cursor position conversion table.

Change-Id: Ia91091e6e3e664e38d043216725769dca98cd726
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoGetLineOfGlyph() and GetLineOfCharacter() methods added to the visual model. 98/37598/3
Victor Cebollada [Tue, 31 Mar 2015 12:34:15 +0000 (13:34 +0100)]
GetLineOfGlyph() and GetLineOfCharacter() methods added to the visual model.
  To be used in the character selection.

Change-Id: If8ead46852f370c85632472c93ec2ecfad8f8f6c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoUse the line ascender and descender. 97/37597/3
Victor Cebollada [Tue, 31 Mar 2015 15:21:22 +0000 (16:21 +0100)]
Use the line ascender and descender.

Change-Id: I86c5b581faa1819a429dd31feb02044e405e855f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoAdd the paragraph's direction to all lines. 94/37594/3
Victor Cebollada [Tue, 31 Mar 2015 14:58:09 +0000 (15:58 +0100)]
Add the paragraph's direction to all lines.

Change-Id: I9438a02451723298cf0ccb01d6c542b30eb44c76
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 49/37849/2
Paul Wisbey [Tue, 7 Apr 2015 10:34:34 +0000 (11:34 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp

Change-Id: Icb029929ab92e9d4c606f47c50d8d213759f09c5

9 years agoFixed popup label properties 93/37693/2
Paul Wisbey [Thu, 2 Apr 2015 13:53:59 +0000 (14:53 +0100)]
Fixed popup label properties

Change-Id: I6d2d1131e8599734738f8d53f5cdbb901c059be7

9 years agoFixed crash in case that overshoot scroll is not enabled 37/37737/1
Jonghyun Ho [Fri, 3 Apr 2015 07:18:35 +0000 (16:18 +0900)]
Fixed crash in case that overshoot scroll is not enabled

Change-Id: I4e92daaa51cdcb1d4ac61b5093ff7bdda5a9024d

9 years agoDALi Version 1.0.36 27/37727/1 accepted/tizen/common/20150407.101646 accepted/tizen/mobile/20150405.124153 accepted/tizen/tv/20150405.122321 accepted/tizen/wearable/20150405.123427 dali_1.0.36 submit/tizen/20150403.055812
Adeel Kazmi [Fri, 3 Apr 2015 05:51:24 +0000 (06:51 +0100)]
DALi Version 1.0.36

Change-Id: I6423379d323b44a8307210d1811e027415d5410a

9 years agoMerge "Size negotiation patch 1: Removed SetPreferred size" into tizen
Adeel Kazmi [Thu, 2 Apr 2015 17:57:46 +0000 (10:57 -0700)]
Merge "Size negotiation patch 1: Removed SetPreferred size" into tizen

9 years agoSize negotiation patch 1: Removed SetPreferred size 77/37677/3
Kingsley Stephens [Tue, 31 Mar 2015 10:21:48 +0000 (11:21 +0100)]
Size negotiation patch 1: Removed SetPreferred size

Change-Id: Ia69eea0c791153b14d2a1d46079182d60e74d6ba

9 years agoAdded TEXT_COLOR, UNDERLINE_ENABLED and UNDERLINE_COLOR to properties and atlas renderer 84/37584/7
Richard Underhill [Thu, 2 Apr 2015 14:46:04 +0000 (15:46 +0100)]
Added TEXT_COLOR, UNDERLINE_ENABLED and UNDERLINE_COLOR to properties and atlas renderer

Change-Id: I0bc2f5a71a64b145c600fd9015dd02db131e5fe7
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Use new animatable registered properties in ScrollView" into tizen
Adeel Kazmi [Thu, 2 Apr 2015 14:24:00 +0000 (07:24 -0700)]
Merge "Use new animatable registered properties in ScrollView" into tizen

9 years agoFix for TextLabel demo styling 86/37686/2
Paul Wisbey [Thu, 2 Apr 2015 12:05:07 +0000 (13:05 +0100)]
Fix for TextLabel demo styling

Change-Id: Ibcfa2172c60537ffe6e9ba2548f2a7a3fc6f3953

9 years agoInclude header files instead of dali.h 62/37562/6
daemyung jang [Tue, 31 Mar 2015 05:25:09 +0000 (14:25 +0900)]
Include header files instead of dali.h

Change-Id: Ia7dfb52a93f548f1c87ca5fa17e95d36156604d9

9 years agoFixes for text related actors after new size negotiation. 49/37649/3
Victor Cebollada [Wed, 1 Apr 2015 15:07:14 +0000 (16:07 +0100)]
Fixes for text related actors after new size negotiation.

Change-Id: I25a3d08a02cbff1a96be5951630bc5e054b24295
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoUse new animatable registered properties in ScrollView 46/37646/4
Richard Huang [Wed, 1 Apr 2015 15:00:52 +0000 (16:00 +0100)]
Use new animatable registered properties in ScrollView

Change-Id: I900da3b5b1f984f028156638d2835056179697dd

9 years agoFixed some TCT tests 48/37648/3
Paul Wisbey [Wed, 1 Apr 2015 15:47:10 +0000 (16:47 +0100)]
Fixed some TCT tests

Change-Id: I7ebf6ba557f311fe42322c680d84392bab1b408c

9 years agoFixes to Text after Size Negotiation 39/37639/3
Agnelo Vaz [Wed, 1 Apr 2015 12:53:15 +0000 (13:53 +0100)]
Fixes to Text after Size Negotiation

Change-Id: I259ff6f23056e587654818d415818e4c7ad7517b
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoReplace TextView with TextLabel 01/37601/2
Paul Wisbey [Tue, 31 Mar 2015 16:38:22 +0000 (17:38 +0100)]
Replace TextView with TextLabel

Change-Id: I302a122867fdb29481ea6b4433589e96c7d58bbe

9 years agoChange button rendering 14/37614/1
Heeyong Song [Wed, 1 Apr 2015 06:20:19 +0000 (15:20 +0900)]
Change button rendering
- Remove animations when the image is set
- Add a selected background image type
- Move the same painter code to Button

Change-Id: I86ee440d49199eb09bb63613e9cb2b147f68e3d2

9 years agoMerge "Fix for lock up on Text Shadow ( not clearing up rendertask correctly )" into...
Paul Wisbey [Tue, 31 Mar 2015 17:28:27 +0000 (10:28 -0700)]
Merge "Fix for lock up on Text Shadow ( not clearing up rendertask correctly )" into new_text

9 years agoResizePolicy for TextField 96/37596/1
Paul Wisbey [Tue, 31 Mar 2015 15:17:21 +0000 (16:17 +0100)]
ResizePolicy for TextField

Change-Id: I9434dea82975db3920716bd46a2eb5b7a89236d0

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 36/37536/6
Paul Wisbey [Mon, 30 Mar 2015 15:03:35 +0000 (16:03 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/relayout-controller-impl.cpp
dali-toolkit/internal/controls/relayout-controller.cpp
dali-toolkit/internal/controls/relayout-helper.cpp
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control.h
docs/content/main-page.h
plugins/dali-script-v8/src/actors/actor-wrapper.h

Change-Id: Ia0aff01756e6d803616d9c4eae82f405c6cb2c0f

9 years agoFix for lock up on Text Shadow ( not clearing up rendertask correctly ) 83/37583/1
Richard Underhill [Tue, 31 Mar 2015 10:42:48 +0000 (11:42 +0100)]
Fix for lock up on Text Shadow ( not clearing up rendertask correctly )

Change-Id: If4d929680b55dc5fed9bd414cd17ce1fc305ad64
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoRemove non-public APIs of Animation 51/37551/1
Heeyong Song [Tue, 31 Mar 2015 02:02:07 +0000 (11:02 +0900)]
Remove non-public APIs of Animation

Change-Id: Ifd96224f116ad16b8d196cab198ebf1d23281198

9 years agoRemove TextView and TextInput tests 41/37541/1
Kingsley Stephens [Mon, 30 Mar 2015 15:39:46 +0000 (16:39 +0100)]
Remove TextView and TextInput tests

Change-Id: I6ec9b1bee202f55c82aac72760b066f7cc3db140

9 years agoNew size negotiation 74/36274/13
Kingsley Stephens [Thu, 20 Nov 2014 12:55:55 +0000 (12:55 +0000)]
New size negotiation

Change-Id: I9867577af2cb5516f8342aa4835db32b42881da9

9 years agoAdded Drop Shadow properties and initial effect with Text Atlas Renderer 37/37437/5
Richard Underhill [Fri, 27 Mar 2015 10:42:04 +0000 (10:42 +0000)]
Added Drop Shadow properties and initial effect with Text Atlas Renderer

Change-Id: Ic68310f1aca1a9f2700dd70ec4a0bf129d5a0f20
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoText vertical alignment added. 42/37442/3
Victor Cebollada [Thu, 26 Mar 2015 15:37:44 +0000 (15:37 +0000)]
Text vertical alignment added.

Change-Id: I5779ef71b2c7f1c041d88232941853fcecd22701
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoTidy up JavaScript plugin makefile 50/37250/4
Nick Holland [Mon, 23 Mar 2015 11:41:19 +0000 (11:41 +0000)]
Tidy up JavaScript plugin makefile

Change-Id: I438714012e5a5eab26a706cafbaa58d4c813ad07

9 years agoBasic support for style names 05/37405/2
Paul Wisbey [Wed, 25 Mar 2015 19:30:39 +0000 (19:30 +0000)]
Basic support for style names

Change-Id: I72bccc4a06bb3852ae16ec74cf4916dfce6a541f

9 years agoMerge "DALi Version 1.0.35" into tizen
Adeel Kazmi [Wed, 25 Mar 2015 15:07:07 +0000 (08:07 -0700)]
Merge "DALi Version 1.0.35" into tizen

9 years agoFix for right to left glyphs reordering. 01/37401/1
Victor Cebollada [Wed, 25 Mar 2015 07:28:45 +0000 (07:28 +0000)]
Fix for right to left glyphs reordering.
  - The character to glyph conversion table was not filled correctly.
    It caused reordering issues when there is a mix of some right to
    left characters generating more than one glyph and some right to
    left glyphs which are formed by more than one character.

Change-Id: I9cecc961ea2254a48a5ab9610956ee05595011ac
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoDALi Version 1.0.35 93/37393/1 accepted/tizen/mobile/20150419.232751 accepted/tizen/tv/20150504.095540 accepted/tizen/wearable/20150504.100105 dali_1.0.35 submit/tizen_mobile/20150417.132551 submit/tizen_tv/20150504.065806 submit/tizen_wearable/20150504.070012
Tom Robinson [Wed, 25 Mar 2015 14:02:30 +0000 (14:02 +0000)]
DALi Version 1.0.35

Change-Id: I16bb203f37dd213924f795a4f5666b38bbecfc58

9 years agoMerge "Rename property & function for background image of Control" into tizen
Adeel Kazmi [Wed, 25 Mar 2015 13:31:20 +0000 (06:31 -0700)]
Merge "Rename property & function for background image of Control" into tizen

9 years agoMerge "Added PathConstraint support to Javascript API" into tizen
Adeel Kazmi [Wed, 25 Mar 2015 09:18:04 +0000 (02:18 -0700)]
Merge "Added PathConstraint support to Javascript API" into tizen

9 years agoRename property & function for background image of Control 51/37251/4
Yoonsang Lee [Mon, 23 Mar 2015 11:51:24 +0000 (20:51 +0900)]
Rename property & function for background image of Control

Control::Property::BACKGROUND -> Control::Property::BACKGROUND_IMAGE
Control::SetBackground()      -> Control::SetBackgroundImage()
"background"                  -> "background-image"

Change-Id: I5e077936976ae8cefa21ecb8537d6e10a857bb29

9 years agoAdded some Selection Highlight code to Decorator 33/37333/7
Paul Wisbey [Tue, 24 Mar 2015 11:58:51 +0000 (11:58 +0000)]
Added some Selection Highlight code to Decorator

Change-Id: I1ee4e535a529e0803d07b484d950729172c788b7

9 years agoMerge "Update README.md for automated-tests" into tizen
Adeel Kazmi [Tue, 24 Mar 2015 14:39:15 +0000 (07:39 -0700)]
Merge "Update README.md for automated-tests" into tizen

9 years agoFixed grab-handle area position 14/37314/4
Paul Wisbey [Tue, 24 Mar 2015 10:05:29 +0000 (10:05 +0000)]
Fixed grab-handle area position

Change-Id: I47b564fd3952ae272a6c823957a04a5ef30e8d72

9 years agoAdding TextSelectionPopup control 06/36806/12
Agnelo Vaz [Fri, 20 Mar 2015 11:02:15 +0000 (11:02 +0000)]
Adding TextSelectionPopup control

Change-Id: Ibfeb0f1f212c76aa9963a6a1c81849daa1baa3ac
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFixed Atlas Manager bug with reusing blocks in freeblockslist 11/37311/3
Richard Underhill [Tue, 24 Mar 2015 09:56:50 +0000 (09:56 +0000)]
Fixed Atlas Manager bug with reusing blocks in freeblockslist

Change-Id: I1aa2309b5aec26232d278f7f319a5d483867d824
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoAdded PathConstraint support to Javascript API 03/37303/2
Ferran Sole [Tue, 24 Mar 2015 09:21:22 +0000 (09:21 +0000)]
Added PathConstraint support to Javascript API

To create a new PathConstraint:
  var pathConstraint = new dali.PathConstraint( myPath, [1.0,0.0] );

To apply the path constraint to an actor:
  actor.applyPathConstraint( pathConstraint, "position", actor, "color-alpha" );
  actor.applyPathConstraint( pathConstraint, "orientation", actor, "color-alpha", [1.0,0.0,0.0] );
The code above will constraint position and orientation of the actor to the path. The parameter to sample
the path will be the color-alpha of the actor.

Change-Id: I9d3f5c48f0e984d0626a0cf41b0ab2dcdd6d9516

9 years agoText Atlas Rendering Artefact fix 60/37260/4
Richard Underhill [Mon, 23 Mar 2015 16:53:06 +0000 (16:53 +0000)]
Text Atlas Rendering Artefact fix

Change-Id: I124b7f2fddfcbdd47d8353f31a2b91252ae27869
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoRespect the accessibility settings 87/36887/6
Paul Wisbey [Mon, 16 Mar 2015 14:36:34 +0000 (14:36 +0000)]
Respect the accessibility settings

Change-Id: I51c5e78b40d5fd641c040b9c8c2944894f94efe9

9 years agoFix for text alignmnet and scrolling. 52/37252/3
Victor Cebollada [Mon, 23 Mar 2015 07:32:13 +0000 (07:32 +0000)]
Fix for text alignmnet and scrolling.

Change-Id: Id800c1a6e8e53cef956d4d7633b6921f03cb5e82
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Added metrics logging to TextAtlasRenderer" into new_text
Paul Wisbey [Mon, 23 Mar 2015 15:00:11 +0000 (08:00 -0700)]
Merge "Added metrics logging to TextAtlasRenderer" into new_text

9 years agoAllow to create shader effect which is type-registered by its type name in JavaScript 36/36536/6
Richard Huang [Mon, 9 Mar 2015 16:19:03 +0000 (16:19 +0000)]
Allow to create shader effect which is type-registered by its type name in JavaScript

Change-Id: I27145106837a36133b6a994cd869c3b03adea5d9

9 years agoFixed some TCT issues 21/37221/1
Paul Wisbey [Sun, 22 Mar 2015 13:34:38 +0000 (13:34 +0000)]
Fixed some TCT issues

Change-Id: I933caca09e5b4817216112aa187ccd485c963742

9 years agoAdded TextLabel guide 02/37202/8
Paul Wisbey [Fri, 20 Mar 2015 14:45:17 +0000 (14:45 +0000)]
Added TextLabel guide

Change-Id: Ia2caf9462b4cd81a60830eb5259da8bdb5f3e20d

9 years agoMerge "Retrieves character's directions." into new_text
Paul Wisbey [Fri, 20 Mar 2015 17:50:37 +0000 (10:50 -0700)]
Merge "Retrieves character's directions." into new_text

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 11/37211/2
Paul Wisbey [Fri, 20 Mar 2015 17:04:31 +0000 (17:04 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/configure.ac

Change-Id: Id18adef88fdd0edca9ccb6a1225ab4def1bedf32

9 years agoMerge "Layout Engine - Fix for multiline" into new_text
Paul Wisbey [Fri, 20 Mar 2015 16:59:07 +0000 (09:59 -0700)]
Merge "Layout Engine - Fix for multiline" into new_text

9 years agoFix JavaScript plugin build break after rotation->orientation property change 72/37172/2
Nick Holland [Fri, 20 Mar 2015 14:18:38 +0000 (14:18 +0000)]
Fix JavaScript plugin build break after rotation->orientation property change

Change-Id: Ia191f33ed1e4e5e30029c963c2dbbf78e96f87dd

9 years agoRemoved old programming guide sections 98/37198/1
Paul Wisbey [Fri, 20 Mar 2015 13:45:06 +0000 (13:45 +0000)]
Removed old programming guide sections

Change-Id: Ie8db0c65ca884a7fb210013b555bc6b520322d69

9 years agoRetrieves character's directions. 33/37133/3
Victor Cebollada [Thu, 19 Mar 2015 08:17:02 +0000 (08:17 +0000)]
Retrieves character's directions.

Change-Id: I0a37c5c3d5ed459359fce987e391284ba16c21a7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoLayout Engine - Fix for multiline 31/37131/4
Victor Cebollada [Thu, 19 Mar 2015 13:46:14 +0000 (13:46 +0000)]
Layout Engine - Fix for multiline

Change-Id: Id630065dc4a600af272f2340796b35ff390f6b26
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoAdded metrics logging to TextAtlasRenderer 57/37057/5
Richard Underhill [Wed, 18 Mar 2015 13:54:12 +0000 (13:54 +0000)]
Added metrics logging to TextAtlasRenderer

Enable Logging with environment variable
for concise logging LOG_TEXT_ATLAS_RENDERER=2,true
for verbose logging LOG_TEXT_ATLAS_RENDERER=4,true

Change-Id: Ica0d01174c642f7b6b538d4f09933656c4d26ec9
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoPicked some defaults for dali-demo on Ubuntu 26/37126/1
Paul Wisbey [Thu, 19 Mar 2015 14:22:01 +0000 (14:22 +0000)]
Picked some defaults for dali-demo on Ubuntu

Change-Id: If0162644da55505e4069af65cbf6f5d926f27c30

9 years agoMerge "DALi Version 1.0.34" into tizen
Adeel Kazmi [Thu, 19 Mar 2015 11:28:15 +0000 (04:28 -0700)]
Merge "DALi Version 1.0.34" into tizen

9 years agoChanged configure/makefile to work with v8 package config 01/36801/7
Nick Holland [Fri, 13 Mar 2015 15:21:28 +0000 (15:21 +0000)]
Changed configure/makefile to work with v8 package config

Also updated v8 version to 3.32.7 (Jan 2015) can't update
any further unless we start using c++11 compiler flags.

Change-Id: Ibdfee429b97aa6b342d3527371c8d7947ae2e11b

9 years agoDALi Version 1.0.34 16/37116/1 dali_1.0.34
Richard Huang [Thu, 19 Mar 2015 11:04:20 +0000 (11:04 +0000)]
DALi Version 1.0.34

Change-Id: I44af4abb9095fa425fb9d2e809bca16305407842

9 years agoMerge "Alignment - Fix a pixel alignment issue with the center alignment." into new_text
Paul Wisbey [Thu, 19 Mar 2015 11:04:03 +0000 (04:04 -0700)]
Merge "Alignment - Fix a pixel alignment issue with the center alignment." into new_text