platform/core/uifw/dali-toolkit.git
9 years agoDALi Version 1.0.41 97/39097/1 accepted/tizen/common/20150512.125104 accepted/tizen/mobile/20150513.005616 accepted/tizen/tv/20150513.005251 accepted/tizen/wearable/20150513.005501 dali_1.0.41 submit/tizen/20150511.143422
Nick Holland [Fri, 8 May 2015 12:52:29 +0000 (13:52 +0100)]
DALi Version 1.0.41

Change-Id: Ia38edc3f527bad772130fa750f06eab405b039b1

9 years agoFixed JSON shaders. Added JSON spec to documentation 29/39029/1
Lee Morgan [Wed, 29 Apr 2015 14:05:16 +0000 (15:05 +0100)]
Fixed JSON shaders. Added JSON spec to documentation

Change-Id: Ia05409e49a9db7c944364bf50fb82cc5e700c37a

9 years agoSimplified the placeholder-text show/hide logic 09/39009/3
Paul Wisbey [Wed, 6 May 2015 15:50:17 +0000 (16:50 +0100)]
Simplified the placeholder-text show/hide logic

Change-Id: I4cd9e7befafcc78fd9f9cb6acdfdc6e79544e8e5

9 years agoCursor fix. 00/39000/1
Victor Cebollada [Wed, 6 May 2015 11:18:20 +0000 (12:18 +0100)]
Cursor fix.

Update the cursor position after all text is removed and
the place holder text appears.

Change-Id: I4455e5b382db195b5129cfd13c47c022811122c9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE - we don't...
HyunJu Shin [Wed, 6 May 2015 02:03:51 +0000 (19:03 -0700)]
Merge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE    - we don't need a padding in other resize policies." into tizen

9 years agoMerge "(ItemView) Store initial value in constraints to apply weight correctly" into...
Kimmo Hoikka [Tue, 5 May 2015 16:04:53 +0000 (09:04 -0700)]
Merge "(ItemView) Store initial value in constraints to apply weight correctly" into tizen

9 years agoMerge "Add more shared C++/JavaScript docs and add JavaScript wrapping guide" into...
Adeel Kazmi [Tue, 5 May 2015 15:45:45 +0000 (08:45 -0700)]
Merge "Add more shared C++/JavaScript docs and add JavaScript wrapping guide" into tizen

9 years agoMerge "More Text related logging & clean-up" into tizen
Adeel Kazmi [Tue, 5 May 2015 14:24:48 +0000 (07:24 -0700)]
Merge "More Text related logging & clean-up" into tizen

9 years agoAdd more shared C++/JavaScript docs and add JavaScript wrapping guide 90/37690/6
Nick Holland [Thu, 2 Apr 2015 11:54:08 +0000 (12:54 +0100)]
Add more shared C++/JavaScript docs and add JavaScript wrapping guide

Change-Id: Ief3c78e0b752b0c21e3dbebeb216317a154a440c

9 years agoMerge "Fix for multi-language support." into tizen
Paul Wisbey [Tue, 5 May 2015 12:32:14 +0000 (05:32 -0700)]
Merge "Fix for multi-language support." into tizen

9 years agoFix for multi-language support. 67/38967/1
Victor Cebollada [Tue, 5 May 2015 08:56:57 +0000 (09:56 +0100)]
Fix for multi-language support.

The validated font per script was not inserted in the chache producing a memory leak and also it was not reused.

Change-Id: Iee3bbbe96a36c65aafa12b92876e633a8af4174a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoSet label padding in case of ResizePolicy::USE_NATURAL_SIZE 63/38963/1
Heeyong Song [Mon, 4 May 2015 08:12:17 +0000 (17:12 +0900)]
Set label padding in case of ResizePolicy::USE_NATURAL_SIZE
   - we don't need a padding in other resize policies.

Change-Id: Icec860efd36a1115a9461ecb10a09a46c0a850fc

10 years agoMore Text related logging & clean-up 54/38954/8
Paul Wisbey [Sat, 2 May 2015 12:40:22 +0000 (13:40 +0100)]
More Text related logging & clean-up

Change-Id: If565d84d0543cdbc8e80c8c8a0f9e4ae16f2fe89

10 years agoFix for PLACEHOLDER_TEXT_FOCUSED feature 53/38953/3
Paul Wisbey [Sat, 2 May 2015 10:12:07 +0000 (11:12 +0100)]
Fix for PLACEHOLDER_TEXT_FOCUSED feature

Change-Id: Ifd2601e7f5d9a012d18af9b5279ade4782d9a164

10 years ago(ItemView) Store initial value in constraints to apply weight correctly 52/38952/1
Adeel Kazmi [Fri, 1 May 2015 16:52:03 +0000 (17:52 +0100)]
(ItemView) Store initial value in constraints to apply weight correctly

[Problem]  Constraint apply animations happen too quickly.
[Cause]    Interpolating between current and final value, but current is being updated.
[Solution] Store the initial value and interpolate between that and the desired value.

Change-Id: I71c6f403058f9ef0774fa1e42f4c0fbf6b7f29c2

10 years agoAdded more DALI_LOG_INFO for Text components 84/38884/13
Paul Wisbey [Wed, 29 Apr 2015 16:04:53 +0000 (17:04 +0100)]
Added more DALI_LOG_INFO for Text components

Enable Logging with environment variable
for general logging LOG_TEXT_CONTROLS=3,true
for verbose logging LOG_TEXT_CONTROLS=4,true

Change-Id: I58b02488875b6c72de28a9638d86dd68a0cb01dc

10 years agoMerge "Added rectangle support for property values" into tizen
Adeel Kazmi [Thu, 30 Apr 2015 10:10:32 +0000 (03:10 -0700)]
Merge "Added rectangle support for property values" into tizen

10 years agoMerge "Fix unsigned/signed int comparison warning" into tizen
Adeel Kazmi [Wed, 29 Apr 2015 16:22:28 +0000 (09:22 -0700)]
Merge "Fix unsigned/signed int comparison warning" into tizen

10 years agoMerge "DALi Version 1.0.40" into tizen
Adeel Kazmi [Wed, 29 Apr 2015 16:20:34 +0000 (09:20 -0700)]
Merge "DALi Version 1.0.40" into tizen

10 years agoFix unsigned/signed int comparison warning 83/38883/1
Kingsley Stephens [Wed, 29 Apr 2015 15:53:56 +0000 (16:53 +0100)]
Fix unsigned/signed int comparison warning

Change-Id: I1ba59f93c7f842fad0a8a2a9b480e813be2c339a

10 years agoDALi Version 1.0.40 71/38871/1 dali_1.0.40
Lee Morgan [Wed, 29 Apr 2015 14:34:20 +0000 (15:34 +0100)]
DALi Version 1.0.40

Change-Id: I9bf818488d818c8beaff43afb6255a232a352599

10 years ago(Doxygen) Added constraints documentation & some clean up 58/38658/3
Adeel Kazmi [Thu, 23 Apr 2015 16:45:10 +0000 (17:45 +0100)]
(Doxygen) Added constraints documentation & some clean up

Change-Id: I226252305a1a2129c5fbe6691440a6422d54fb91

10 years agoAdded rectangle support for property values 71/37371/7
Nick Holland [Wed, 25 Mar 2015 09:40:00 +0000 (09:40 +0000)]
Added rectangle support for property values

layer.clippingBox = [ 2,54,56,4];
was failing

Change-Id: I5f438bbd24d169b5081a66635d14e459a5124e79

10 years agoPlaceholderText + IMF improvements 23/38723/12
Paul Wisbey [Sat, 25 Apr 2015 11:40:16 +0000 (12:40 +0100)]
PlaceholderText + IMF improvements

Change-Id: I14e33827fca8df01ac22699e59908f47c4341c2d

10 years agoMerge "Alpha function changes" into tizen
Adeel Kazmi [Mon, 27 Apr 2015 09:21:18 +0000 (02:21 -0700)]
Merge "Alpha function changes" into tizen

10 years agoTextField to limit Input to maximum characters and emit signal 56/38656/10
Agnelo Vaz [Wed, 22 Apr 2015 15:58:46 +0000 (16:58 +0100)]
TextField to limit Input to maximum characters and emit signal

Change-Id: I592740c84c1121b2e5c9d3f779b4639236fa4ea6
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
10 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>
10 years agoAlpha function changes 14/38414/9
Ferran Sole [Mon, 20 Apr 2015 13:46:55 +0000 (14:46 +0100)]
Alpha function changes

Change-Id: I26579ded59bbbce7c1dcb4c9b068f22046879ab1

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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>
10 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

10 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>
10 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>
10 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

10 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>
10 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

10 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

10 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

10 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

10 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>
10 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

10 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>
10 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

10 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

10 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

10 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

10 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

10 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>
10 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

10 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

10 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>
10 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

10 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

10 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>
10 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>
10 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

10 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

10 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>
10 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>
10 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

10 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

10 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>
10 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

10 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

10 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>
10 years agoMerge "Layout fixes" into tizen
Paul Wisbey [Tue, 14 Apr 2015 10:26:58 +0000 (03:26 -0700)]
Merge "Layout fixes" into tizen

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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>
10 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

10 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

10 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

10 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

10 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>
10 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>