platform/core/uifw/dali-toolkit.git
9 years agoSelection Handled Scrolling - Step1 94/38694/6
Victor Cebollada [Fri, 24 Apr 2015 06:33:49 +0000 (07:33 +0100)]
Selection Handled Scrolling - Step1

  *Decorator uses the same data structure to store the three handles.
  *Decorator uses the same code to send events to the controller for the three handles.

Change-Id: I14595b6531c55ecfffedc7a8266a2f70b927c5ce
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "(Page) Using registered properties" into tizen
Kimmo Hoikka [Fri, 24 Apr 2015 14:35:05 +0000 (07:35 -0700)]
Merge "(Page) Using registered properties" into tizen

9 years agoMerge "Delete view from toolkit and move cluster into demo" into tizen
Kimmo Hoikka [Fri, 24 Apr 2015 14:34:13 +0000 (07:34 -0700)]
Merge "Delete view from toolkit and move cluster into demo" into tizen

9 years ago(Page) Using registered properties 81/38681/3
Adeel Kazmi [Fri, 24 Apr 2015 10:33:06 +0000 (11:33 +0100)]
(Page) Using registered properties

Change-Id: I7e61c64244b9e0b9179287898295eb6778d9cef0

9 years agoDelete view from toolkit and move cluster into demo 79/38679/2
Kingsley Stephens [Fri, 17 Apr 2015 12:14:56 +0000 (13:14 +0100)]
Delete view from toolkit and move cluster into demo

Change-Id: I079a8b85eaedc2a9915db163f6ab1e5f17557c49

9 years agoTextField property updates 01/38601/18
Paul Wisbey [Wed, 22 Apr 2015 14:25:30 +0000 (15:25 +0100)]
TextField property updates

Change-Id: I5ee0b8ef3e7e0b9760a4731f05fb479dfe123be8

9 years ago(AutomatedTests) Removed control style-change test case 52/38652/1
Adeel Kazmi [Thu, 23 Apr 2015 13:52:13 +0000 (14:52 +0100)]
(AutomatedTests) Removed control style-change test case

Change-Id: Ie10be9b842a236c31eb17d5b391da419e71af170

9 years agoMerge "Cursor Scrolling." into tizen
Paul Wisbey [Thu, 23 Apr 2015 13:36:59 +0000 (06:36 -0700)]
Merge "Cursor Scrolling." into tizen

9 years agoMerge "Make cursor invisible when exceeds the boundaries of the Text Control." into...
Paul Wisbey [Thu, 23 Apr 2015 13:33:39 +0000 (06:33 -0700)]
Merge "Make cursor invisible when exceeds the boundaries of the Text Control." into tizen

9 years agoMerge "Text Decorator - Set positions in Control coords." into tizen
Paul Wisbey [Thu, 23 Apr 2015 13:33:25 +0000 (06:33 -0700)]
Merge "Text Decorator - Set positions in Control coords." into tizen

9 years agoFix the failed test case for ScrollView overshoot 50/38650/1
Richard Huang [Thu, 23 Apr 2015 13:04:41 +0000 (14:04 +0100)]
Fix the failed test case for ScrollView overshoot

Change-Id: I26e538df346d5ed98d6a5998b7eb07c1441948b8

9 years agoMerge "DALi Version 1.0.39" into tizen
Adeel Kazmi [Thu, 23 Apr 2015 11:08:20 +0000 (04:08 -0700)]
Merge "DALi Version 1.0.39" into tizen

9 years agoDALi Version 1.0.39 43/38643/1 dali_1.0.39
Xiangyin Ma [Thu, 23 Apr 2015 11:04:30 +0000 (12:04 +0100)]
DALi Version 1.0.39

Change-Id: Ie8c22ac0e9f6a8d08826bed7604c6768dc3fd5c4

9 years agoCursor Scrolling. 03/38603/5
Victor Cebollada [Wed, 15 Apr 2015 12:56:53 +0000 (13:56 +0100)]
Cursor Scrolling.

Change-Id: Ief97436d85ea16e4af852468785e40bdecb1a160
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years ago(AutomatedTests) Remove View test cases 36/38636/1
Adeel Kazmi [Thu, 23 Apr 2015 09:44:43 +0000 (10:44 +0100)]
(AutomatedTests) Remove View test cases

Change-Id: Icb8ed042dbb1b3f232face9103e045f353c164b9

9 years agoMake cursor invisible when exceeds the boundaries of the Text Control. 83/38583/5
Victor Cebollada [Wed, 22 Apr 2015 08:02:23 +0000 (09:02 +0100)]
Make cursor invisible when exceeds the boundaries of the Text Control.

Change-Id: I1a038bb45d6e7d5fca388aac6e1d1202a7874b9a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoText Decorator - Set positions in Control coords. 71/38571/5
Victor Cebollada [Tue, 21 Apr 2015 15:36:49 +0000 (16:36 +0100)]
Text Decorator - Set positions in Control coords.

Change-Id: I2417c24e4b5035e821ed7b311723a856973823a0
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Type registry macros made namespace-generic: toolkit" into tizen
Kimmo Hoikka [Wed, 22 Apr 2015 15:22:02 +0000 (08:22 -0700)]
Merge "Type registry macros made namespace-generic: toolkit" into tizen

9 years agoSplit text-controller files in text-controller and text-controller-impl. 15/38315/8
Victor Cebollada [Thu, 16 Apr 2015 08:53:05 +0000 (09:53 +0100)]
Split text-controller files in text-controller and text-controller-impl.

Change-Id: I72f41a8fba43da1570e7231904bead38d90310dc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoType registry macros made namespace-generic: toolkit 22/38522/4
Tom Robinson [Wed, 22 Apr 2015 10:24:12 +0000 (11:24 +0100)]
Type registry macros made namespace-generic: toolkit

Change-Id: I303755ba21cec9ef4c0e3a6d2cc1c74f9f0c8fae

9 years agoMerge "Test cases for new KeyInputFocus signals" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:08:23 +0000 (05:08 -0700)]
Merge "Test cases for new KeyInputFocus signals" into tizen

9 years agoMerge "Fixes crash when fontclient is unable to supply a correct bitmap" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:07:41 +0000 (05:07 -0700)]
Merge "Fixes crash when fontclient is unable to supply a correct bitmap" into tizen

9 years agoMerge "Fix to default Shadow Color setting" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:07:05 +0000 (05:07 -0700)]
Merge "Fix to default Shadow Color setting" into tizen

9 years agoTest cases for new KeyInputFocus signals 27/38527/2
Agnelo Vaz [Tue, 21 Apr 2015 16:17:18 +0000 (17:17 +0100)]
Test cases for new KeyInputFocus signals

Change-Id: If8898640d0e70fe20bb9a34b2d784d6cbc849c68
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "Remove unnecessary stream operators from radian and degree as well as unnecess...
Adeel Kazmi [Wed, 22 Apr 2015 10:23:35 +0000 (03:23 -0700)]
Merge "Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis" into tizen

9 years agoControls to Emit Signals when Key Input Focus lost or gained 11/38511/4
Agnelo Vaz [Tue, 21 Apr 2015 13:36:35 +0000 (14:36 +0100)]
Controls to Emit Signals when Key Input Focus lost or gained

Change-Id: Iecc83cf41be7783436fa5a936d1e17e8afa1f692
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoUpdate copyright year to 2015 for public api: toolkit 99/38499/2
Tom Robinson [Tue, 21 Apr 2015 11:03:19 +0000 (12:03 +0100)]
Update copyright year to 2015 for public api: toolkit

Change-Id: I63856bf33b9efe4984e6d5a1874acf2ec3f2955c

9 years agoMerge "Increased test coverage on TextLabel and TextField" into tizen
Paul Wisbey [Tue, 21 Apr 2015 13:30:40 +0000 (06:30 -0700)]
Merge "Increased test coverage on TextLabel and TextField" into tizen

9 years agoRemove unnecessary stream operators from radian and degree as well as unnecessary... 96/38496/2
Kimmo Hoikka [Tue, 21 Apr 2015 10:53:35 +0000 (11:53 +0100)]
Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis

Change-Id: Icc4edab7df8ba10e902964c8967bce04b1c7a7ea

9 years agoMerge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

9 years agoMerge "Cleanup for removal of ImageAttributes from public API" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:11:43 +0000 (10:11 -0700)]
Merge "Cleanup for removal of ImageAttributes from public API" into tizen

9 years agoIncreased test coverage on TextLabel and TextField 31/38331/3
Richard Underhill [Thu, 16 Apr 2015 14:26:05 +0000 (15:26 +0100)]
Increased test coverage on TextLabel and TextField

Change-Id: I5bddb6dcbb6c8090815b94a2151b44b5d3ebd239
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoSize negotiation patch 4: Remove SetRelayoutEnabled 78/38278/6
Kingsley Stephens [Tue, 14 Apr 2015 13:00:34 +0000 (14:00 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled

PushButton size negotiation fixes

Change-Id: I497d3d2c357ee97e0970171f1888e5c45871abca

9 years agoSlider fix: Fix progress bar dissapearing with negative slider values. 44/37944/3
Kingsley Stephens [Wed, 8 Apr 2015 15:37:28 +0000 (16:37 +0100)]
Slider fix: Fix progress bar dissapearing with negative slider values.

Change-Id: Ic3b7d29ae6de4a2652147eb2f26118fc44ffbbd5

9 years agoCleanup for removal of ImageAttributes from public API 93/37593/10
Andrew Cox [Tue, 31 Mar 2015 14:55:29 +0000 (15:55 +0100)]
Cleanup for removal of ImageAttributes from public API

Change-Id: Ia2efe9ef0dffe1361f0e6995b0e8134324916a4d
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoCleaned up Degree, Radian, AngleAxis and Quaternion classes 66/37066/8
Kimmo Hoikka [Tue, 14 Apr 2015 15:56:51 +0000 (16:56 +0100)]
Cleaned up Degree, Radian, AngleAxis and Quaternion classes
- Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code
- Change AngleAxis to store a Radian angle for better accuracy
- Make Quaternion explicitly take a Radian as constructor

Change-Id: I81f5478572322c65f87045d1b58c621da8989d27

9 years agoMerge "Use orientation from Window not application" into tizen
Paul Wisbey [Thu, 16 Apr 2015 12:49:04 +0000 (05:49 -0700)]
Merge "Use orientation from Window not application" into tizen

9 years agoFixes crash when fontclient is unable to supply a correct bitmap 14/38314/1
Richard Underhill [Thu, 16 Apr 2015 10:28:25 +0000 (11:28 +0100)]
Fixes crash when fontclient is unable to supply a correct bitmap

Change-Id: Idcc5f0921e39ce8927a429987a8edc8567103d9d
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoFix to default Shadow Color setting 75/38275/3
Richard Underhill [Thu, 16 Apr 2015 08:51:02 +0000 (09:51 +0100)]
Fix to default Shadow Color setting

Change-Id: I45788e8dcf2a9ac63e4d3b759de071621f7d6f30
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Text Selection Popup to use bounding box and table views" into tizen
Paul Wisbey [Wed, 15 Apr 2015 17:33:29 +0000 (10:33 -0700)]
Merge "Text Selection Popup to use bounding box and table views" into tizen

9 years agoText-related Programming guide updates 14/38214/16
Paul Wisbey [Tue, 14 Apr 2015 15:12:08 +0000 (16:12 +0100)]
Text-related Programming guide updates

Change-Id: I474917bd30af46ad58b389c5c8c3e4469578c606

9 years agoText Selection Popup to use bounding box and table views 15/38215/3
Agnelo Vaz [Tue, 14 Apr 2015 15:49:01 +0000 (16:49 +0100)]
Text Selection Popup to use bounding box and table views

Change-Id: I0ff7776a5cd8c5f9ad49f2d11d7c930b96f1ed24
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFix for Text Rendering Artefacts 32/38132/5
Richard Underhill [Wed, 15 Apr 2015 08:35:19 +0000 (09:35 +0100)]
Fix for Text Rendering Artefacts

Change-Id: I64f318791b61629a750ec2e558625ada7da1de97
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoDALi Version 1.0.38 60/38260/1 dali_1.0.38
Ferran Sole [Wed, 15 Apr 2015 11:58:08 +0000 (12:58 +0100)]
DALi Version 1.0.38

Change-Id: I2d12e0d929edbb5c44d39adacf33a0cce61e958a

9 years agoUse orientation from Window not application 87/38087/2
Nick Holland [Fri, 10 Apr 2015 14:36:21 +0000 (15:36 +0100)]
Use orientation from Window not application

Change-Id: I71b88e71a64dfe4e2ebe139126c2e2acd9c26373

9 years agoAdded UNDERLINE_HEIGHT Property to override font metrics 34/38134/4
Richard Underhill [Tue, 14 Apr 2015 09:21:45 +0000 (10:21 +0100)]
Added UNDERLINE_HEIGHT Property to override font metrics

Change-Id: I04398e2ef68a758ed6524a6fa7640e9a35c6532c
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
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