platform/core/uifw/dali-toolkit.git
6 years agoMerge remote-tracking branch 'origin/tizen' into new_text 14/36314/1
Paul Wisbey [Wed, 4 Mar 2015 19:26:43 +0000 (19:26 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali-toolkit/internal/controls/text-input/text-input-impl.cpp

Change-Id: Iab734e2329bb8c1380fe115b5924b734ad10c759

6 years agoMerge remote-tracking branch 'origin/tizen' into new_text 09/36309/4
Paul Wisbey [Wed, 4 Mar 2015 18:08:51 +0000 (18:08 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I47246662ec5ea38428d62f11f9dd5e5bc0c50dd1

6 years agoUpdates after TapGestureDetector API Change 02/36302/2
Adeel Kazmi [Wed, 4 Mar 2015 16:18:46 +0000 (16:18 +0000)]
Updates after TapGestureDetector API Change

Change-Id: Ib4ca3598bde23e804b4a09f6960065c38f5883c3

6 years agoLog which Fonts are selected for each script 04/36304/1
Paul Wisbey [Wed, 4 Mar 2015 16:34:19 +0000 (16:34 +0000)]
Log which Fonts are selected for each script

Change-Id: I2fd1a055cb37c35895c3da49d503457f55f3457c

6 years agoDALi Version 1.0.32 95/36295/1 dali_1.0.32
Lee Morgan [Wed, 4 Mar 2015 16:11:01 +0000 (16:11 +0000)]
DALi Version 1.0.32

Change-Id: I5007bc6970c0130a9aa5a3b51a86bcc58e077f32

6 years agoFixed GetHeightForWidth for text label 43/36143/12
Paul Wisbey [Mon, 2 Mar 2015 18:52:37 +0000 (18:52 +0000)]
Fixed GetHeightForWidth for text label

Change-Id: Ie91ab93ea2fa4fc11589baf867f468c5ceb44082

6 years agoMerge "Text segmentation interface" into new_text
Paul Wisbey [Wed, 4 Mar 2015 10:34:40 +0000 (02:34 -0800)]
Merge "Text segmentation interface" into new_text

6 years agoBidirectional support interface 59/33859/8
Victor Cebollada [Thu, 15 Jan 2015 16:32:01 +0000 (16:32 +0000)]
Bidirectional support interface

Change-Id: I75e34e13432c242c79ef1327668f782ccc9d675e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge "Multi-language support interface" into new_text
Paul Wisbey [Tue, 3 Mar 2015 18:52:43 +0000 (10:52 -0800)]
Merge "Multi-language support interface" into new_text

6 years agoText shaper interface 27/33927/7
Victor Cebollada [Fri, 16 Jan 2015 14:27:34 +0000 (14:27 +0000)]
Text shaper interface

Change-Id: I9568493e820501b4e215424b6fcfb906ec8680a5
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoAdding Decorator BoundingBox 23/36223/5
Agnelo Vaz [Tue, 3 Mar 2015 16:17:40 +0000 (16:17 +0000)]
Adding Decorator BoundingBox

Change-Id: Iea3b56d5d9764a4ae124bb422b839a0b86cbe14d
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
6 years agoText segmentation interface 60/33860/8
Victor Cebollada [Thu, 15 Jan 2015 17:11:22 +0000 (17:11 +0000)]
Text segmentation interface

Change-Id: Ic886d7192f6552f8a16c4722cf516c2082c3d0ac
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMulti-language support interface 26/33926/7
Victor Cebollada [Fri, 16 Jan 2015 13:59:51 +0000 (13:59 +0000)]
Multi-language support interface

Change-Id: Id3e798702c7584bea698ee1e02f93f6e21e6ce48
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoUpdates following boost::function removal from adaptor 13/36213/1
Adeel Kazmi [Tue, 3 Mar 2015 09:40:07 +0000 (09:40 +0000)]
Updates following boost::function removal from adaptor

Still to do - Remove boost::function from builder

Change-Id: Ica46c381bbd03f1bab3fd664b24b4a15b503f5e9

6 years agoUse a different image for 'pressed' selection handle 82/36182/1
Paul Wisbey [Tue, 3 Mar 2015 08:39:44 +0000 (08:39 +0000)]
Use a different image for 'pressed' selection handle

Change-Id: I83493305f3d701bc4430286c81e43b536827422e

6 years agoPass Grab handle events to Controller 35/36135/7
Paul Wisbey [Mon, 2 Mar 2015 15:41:54 +0000 (15:41 +0000)]
Pass Grab handle events to Controller

Change-Id: I24c369ef7eefa7397e88e897c683536501c62076

6 years agoDecorator to show cursor 38/36138/1
Agnelo Vaz [Mon, 2 Mar 2015 17:08:44 +0000 (17:08 +0000)]
Decorator to show cursor

Change-Id: I178d1f99ccc1246984cada7e0bf15c66435d1b1d
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
6 years agoProperty refactor in dali-core: Toolkit changes for compiling 07/35807/5
Tom Robinson [Tue, 24 Feb 2015 19:35:34 +0000 (19:35 +0000)]
Property refactor in dali-core: Toolkit changes for compiling

Change-Id: I98215514f2fac2fefc9a77b73b9c35713968ba7a

6 years agoChanged Type of PROPERTY_RENDERING_BACKEND to signed, to correct Property::Value... 32/36132/1
Richard Underhill [Mon, 2 Mar 2015 15:09:31 +0000 (15:09 +0000)]
Changed Type of PROPERTY_RENDERING_BACKEND to signed, to correct Property::Value construction from enum

Change-Id: I0dcfb5b6325c53dc8d4b0aa855268ff18edd1218
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
6 years agoCopied some TextInput grab/selection handle code 77/36077/8
Paul Wisbey [Sun, 1 Mar 2015 13:39:27 +0000 (13:39 +0000)]
Copied some TextInput grab/selection handle code

Change-Id: Id65562d557cd2017e3d54f44e9e764a34ad73697

6 years agoMerge "Refactoring Button: remove painter" into tizen
HyunJu Shin [Mon, 2 Mar 2015 08:56:31 +0000 (00:56 -0800)]
Merge "Refactoring Button: remove painter" into tizen

6 years agoAdded Property for the rendering back-end 76/36076/7
Paul Wisbey [Sat, 28 Feb 2015 18:51:18 +0000 (18:51 +0000)]
Added Property for the rendering back-end

Change-Id: I17562b649bb8be0fc7038a0a5e3fb9becd6fc94a

6 years agoMerge "Added interface for queuing input events in TextController" into new_text
Paul Wisbey [Fri, 27 Feb 2015 17:54:16 +0000 (09:54 -0800)]
Merge "Added interface for queuing input events in TextController" into new_text

6 years agoMerge "Removed AffectedByLighting APIs from MeshActor" into tizen
Kimmo Hoikka [Fri, 27 Feb 2015 15:09:42 +0000 (07:09 -0800)]
Merge "Removed AffectedByLighting APIs from MeshActor" into tizen

6 years agoAdded interface for queuing input events in TextController 68/35968/11
Paul Wisbey [Thu, 26 Feb 2015 19:00:32 +0000 (19:00 +0000)]
Added interface for queuing input events in TextController

Change-Id: I66c96382884a6fa607eea5a6eb87a8f929366362

6 years agoMerge "Stop using string comparison against exported constant to check if string...
Kimmo Hoikka [Fri, 27 Feb 2015 13:49:51 +0000 (05:49 -0800)]
Merge "Stop using string comparison against exported constant to check if string has contents" into tizen

6 years agoStop using string comparison against exported constant to check if string has contents 14/36014/2
Kimmo Hoikka [Fri, 27 Feb 2015 11:04:57 +0000 (11:04 +0000)]
Stop using string comparison against exported constant to check if string has contents

Change-Id: Ib8c3988ad22408ada8d3f81908b847c14326a055

6 years agoChange incorrect anchorpoint in popup 26/36026/2
Kimmo Hoikka [Fri, 27 Feb 2015 11:42:32 +0000 (11:42 +0000)]
Change incorrect anchorpoint in popup

Change-Id: Ie7cf70972ec0c182d4c2b94638f6f727a4d255d0

6 years agoRemoved AffectedByLighting APIs from MeshActor 17/36017/1
David Steele [Fri, 27 Feb 2015 11:08:04 +0000 (11:08 +0000)]
Removed AffectedByLighting APIs from MeshActor

Change-Id: Ie9e3fdcb4f4b18bec7bd9f28abf058b9430d83d9

6 years agoMerge "JavaScript support for DALi" into tizen
Adeel Kazmi [Fri, 27 Feb 2015 09:02:39 +0000 (01:02 -0800)]
Merge "JavaScript support for DALi" into tizen

6 years agoRefactoring Button: remove painter 00/35900/2
Heeyong Song [Thu, 26 Feb 2015 00:23:00 +0000 (09:23 +0900)]
Refactoring Button: remove painter

Change-Id: I37a0dc2c734458dd135834e2df1d14b2bf22b8cc

6 years agoFixes for Shaping. Do not shape \n characters. 40/35940/3
Victor Cebollada [Tue, 24 Feb 2015 15:05:22 +0000 (15:05 +0000)]
Fixes for Shaping. Do not shape \n characters.

Change-Id: Id1525613266d1c0aa2dde1eb6d0323c828f3a0e3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoFixes for multi-language. 39/35939/3
Victor Cebollada [Tue, 24 Feb 2015 15:07:35 +0000 (15:07 +0000)]
Fixes for multi-language.
White spaces are detected as LATIN. Do not change the script if there is a white space.
Use the line break info to get the '\n' characters.

Change-Id: I18a4ea47a7dbc351a18c249aa72e2b269ee39b81
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoJavaScript support for DALi 57/34057/15
Nick Holland [Tue, 20 Jan 2015 16:02:00 +0000 (16:02 +0000)]
JavaScript support for DALi

Configure with --enable-javascript to use
Requires v8 to build (v3.25.19)

git clone git://github.com/v8/v8.git
cd v8
git checkout 5475d473f7fa6f33296276e7b25fc1fe955ab166

Change-Id: Ic22273ab0875e6e21186261fe88a2ac57af162ae

6 years agoReplace vector.h with vector-wrapper.h 95/35895/2
Adeel Kazmi [Wed, 25 Feb 2015 16:59:38 +0000 (16:59 +0000)]
Replace vector.h with vector-wrapper.h

Change-Id: Ib42e49064314960e3c8cb501983d9972160d4d1e

6 years agoMerge "Updates following 'Rename BitmapImage as BufferImage'" into tizen
Adeel Kazmi [Wed, 25 Feb 2015 16:51:21 +0000 (08:51 -0800)]
Merge "Updates following 'Rename BitmapImage as BufferImage'" into tizen

6 years agoMerge "DALi Version 1.0.31" into tizen
Adeel Kazmi [Wed, 25 Feb 2015 14:26:23 +0000 (06:26 -0800)]
Merge "DALi Version 1.0.31" into tizen

6 years agoMerge remote-tracking branch 'origin/tizen' into new_text 88/35888/3
Paul Wisbey [Wed, 25 Feb 2015 13:33:11 +0000 (13:33 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
dali-toolkit/public-api/controls/text-input/text-input.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.cpp
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: Icce105492c4770040956a99aa871bbda03f0da4c

6 years agoMerge "Scrollable public API clean-up phase 1" into tizen
Adeel Kazmi [Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)]
Merge "Scrollable public API clean-up phase 1" into tizen

6 years agoDALi Version 1.0.31 61/35861/1 dali_1.0.31
Kingsley Stephens [Wed, 25 Feb 2015 11:33:30 +0000 (11:33 +0000)]
DALi Version 1.0.31

Change-Id: I69688805b9e6179eaa55570fd99b40d507024e44

6 years agoUpdates following 'Rename BitmapImage as BufferImage' 11/35711/7
Xiangyin Ma [Mon, 23 Feb 2015 17:02:23 +0000 (17:02 +0000)]
Updates following 'Rename BitmapImage as BufferImage'

Change-Id: I33b87c5e3f5e23ee134fe93c7f5e2c5205a9448f

6 years agoAdded some TextField boilerplate code 04/35804/5
Paul Wisbey [Tue, 24 Feb 2015 18:08:24 +0000 (18:08 +0000)]
Added some TextField boilerplate code

Change-Id: I6d9d349a02f2243887f2e92af671c727be0ca04c

6 years agoMerge "Updates after Handle/Constrainable merge" into tizen
Kimmo Hoikka [Wed, 25 Feb 2015 11:05:20 +0000 (03:05 -0800)]
Merge "Updates after Handle/Constrainable merge" into tizen

6 years agoMerge "Skeleton Decorator API" into new_text
Paul Wisbey [Tue, 24 Feb 2015 17:36:38 +0000 (09:36 -0800)]
Merge "Skeleton Decorator API" into new_text

6 years agoScrollable public API clean-up phase 1 60/35560/3
Richard Huang [Tue, 17 Feb 2015 14:27:36 +0000 (14:27 +0000)]
Scrollable public API clean-up phase 1

Change-Id: Idc65f3e14554895641b178c04048ffa2f63e92d4

6 years agoSkeleton Decorator API 62/35762/5
Paul Wisbey [Tue, 24 Feb 2015 10:21:16 +0000 (10:21 +0000)]
Skeleton Decorator API

Change-Id: Ib30eca2376d5927f52e4c06cb93dd65c903a629e

6 years agoUpdates after Handle/Constrainable merge 86/35786/2
Adeel Kazmi [Tue, 24 Feb 2015 14:05:38 +0000 (14:05 +0000)]
Updates after Handle/Constrainable merge

Change-Id: Ia13e9eaa9644af5295ed3c05737019d8bc9f23b7

6 years agoAdded shader effect to render quadratic bezier curves and bounded regions on the GPU 96/35696/4
Ferran Sole [Mon, 23 Feb 2015 11:57:43 +0000 (11:57 +0000)]
Added shader effect to render quadratic bezier curves and bounded regions on the GPU

Change-Id: I246162665cbbdf438d601e337c830dea7cdf19c6

6 years agoFollow the include-order coding conventions 73/35773/3
Paul Wisbey [Tue, 24 Feb 2015 12:02:08 +0000 (12:02 +0000)]
Follow the include-order coding conventions

Change-Id: I316b5d62f4c31b38740067186d29dc4cb5cf0767

6 years agoMerge "(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo...
Kimmo Hoikka [Mon, 23 Feb 2015 17:23:36 +0000 (09:23 -0800)]
Merge "(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo) while it's active" into tizen

6 years agoMerge "Follow the include-order coding conventions" into tizen
Adeel Kazmi [Mon, 23 Feb 2015 16:47:05 +0000 (08:47 -0800)]
Merge "Follow the include-order coding conventions" into tizen

6 years agoMerge "Addition of build flag "-Wl,-Bsymbolic-functions" for launching performance...
Adeel Kazmi [Mon, 23 Feb 2015 16:01:11 +0000 (08:01 -0800)]
Merge "Addition of build flag "-Wl,-Bsymbolic-functions" for launching performance" into tizen

6 years ago(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo) while... 97/35697/2
Adeel Kazmi [Mon, 23 Feb 2015 12:02:16 +0000 (12:02 +0000)]
(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo) while it's active

Patch from Matthew Stephenson

[Problem]  ScrollTo while timer is active causing undesired effects.
[Solution] Cancel the timer when TransformTo is called.

Change-Id: I6dd96454c0044054d929f30759f05c70e4877cd3

6 years agoFollow the include-order coding conventions 94/35694/1
Paul Wisbey [Mon, 23 Feb 2015 11:50:12 +0000 (11:50 +0000)]
Follow the include-order coding conventions

Change-Id: I890cc03cca27374fb2a2d9c8645c86b0a19738c5

6 years agoAddition of build flag "-Wl,-Bsymbolic-functions" for launching performance 82/35682/1
taeyoon [Mon, 23 Feb 2015 09:02:05 +0000 (18:02 +0900)]
Addition of build flag "-Wl,-Bsymbolic-functions" for launching performance

Change-Id: Iab08c26a21316fffafabe724998cf0c060864c00

6 years agoTextLabel::GetHeightForWidth() implementation. 36/35636/2
Victor Cebollada [Fri, 20 Feb 2015 08:45:23 +0000 (08:45 +0000)]
TextLabel::GetHeightForWidth() implementation.

Change-Id: Iaa9e3895668b0e38246c4a5c06a18086d3f2ab4d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoSpecial characters added to the script. 22/35622/3
Victor Cebollada [Thu, 19 Feb 2015 16:50:46 +0000 (16:50 +0000)]
Special characters added to the script.

Change-Id: I4db6d47b9a221fc5ca835c81929ecf2272166abc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoInclude <string> to compensate for core inclusion cleanup 98/35598/4
Andrew Cox [Thu, 19 Feb 2015 00:11:55 +0000 (00:11 +0000)]
Include <string> to compensate for core inclusion cleanup

Follows core patch: https://review.tizen.org/gerrit/#/c/35596
and adaptor patch: https://review.tizen.org/gerrit/#/c/35597/

Change-Id: I926992fcf979695dfd316f6b1d06825dc60f5ed9
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
6 years agoMerge "Typo fixed in Control implementation doc." into tizen
Adeel Kazmi [Thu, 19 Feb 2015 10:35:36 +0000 (02:35 -0800)]
Merge "Typo fixed in Control implementation doc." into tizen

6 years agoTypo fixed in Control implementation doc. 09/35609/1
Victor Cebollada [Thu, 19 Feb 2015 10:09:14 +0000 (10:09 +0000)]
Typo fixed in Control implementation doc.

Change-Id: I7f1e4d3b4668af54bad62704e0bd5ba58e6b0c36
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge "Remove unnecessarily exported signals and action names" into tizen
Adeel Kazmi [Wed, 18 Feb 2015 17:39:28 +0000 (09:39 -0800)]
Merge "Remove unnecessarily exported signals and action names" into tizen

6 years agoTextModel interface. 35/34835/7
Victor Cebollada [Tue, 3 Feb 2015 10:39:24 +0000 (10:39 +0000)]
TextModel interface.

Change-Id: I630492ffd846dbb1c84254c10585045ae27da7bf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoShaper implementation 14/35214/6
Victor Cebollada [Tue, 10 Feb 2015 08:52:30 +0000 (08:52 +0000)]
Shaper implementation

Change-Id: Ia7e7062c12c08f5c8829037ea867282ee9ba77b8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge "DALi Version 1.0.30" into tizen
Adeel Kazmi [Wed, 18 Feb 2015 15:18:24 +0000 (07:18 -0800)]
Merge "DALi Version 1.0.30" into tizen

6 years agoDALi Version 1.0.30 78/35578/1 dali_1.0.30
Ferran Sole [Wed, 18 Feb 2015 14:33:59 +0000 (14:33 +0000)]
DALi Version 1.0.30

Change-Id: Ic6b45ba22e0e4f5d3850aaf257d7c14b3d1c30fa

6 years agoRemove unnecessarily exported signals and action names 56/35556/5
Tom Robinson [Tue, 17 Feb 2015 13:58:19 +0000 (13:58 +0000)]
Remove unnecessarily exported signals and action names

Change-Id: Iffe4621c04d06cb98eaec6cd84b69fa520f3b492

6 years agoDali-toolkit: Replace constraints with SizeMode 68/35368/3
Tom Robinson [Thu, 12 Feb 2015 15:30:30 +0000 (15:30 +0000)]
Dali-toolkit: Replace constraints with SizeMode

Change-Id: I8bc67f3b0c781f0f5c30f3576972ff1008c8c16c

6 years agoUpdates following Scripting changes in Core 40/35540/2
Adeel Kazmi [Tue, 17 Feb 2015 11:26:02 +0000 (11:26 +0000)]
Updates following Scripting changes in Core

Change-Id: Ia9fdbdb2b2635a6358a490103b1d5fcf9b117bca

6 years agoUpdate toolkit with ResourceImage/Image split 30/35430/4
Xiangyin Ma [Fri, 13 Feb 2015 16:16:24 +0000 (16:16 +0000)]
Update toolkit with ResourceImage/Image split

Change-Id: Ia56f0e6f012264807bb575c5dff08b1d87b6cc8b

6 years agoText segmentation implementation 76/35476/2
Victor Cebollada [Mon, 16 Feb 2015 09:20:48 +0000 (09:20 +0000)]
Text segmentation implementation

Change-Id: I923a98e88181cd291d84f55fbc23940b3b02d30e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge "Button Refactoring phase 1" into tizen submit/tizen/20150217.020310
Adeel Kazmi [Mon, 16 Feb 2015 17:33:20 +0000 (09:33 -0800)]
Merge "Button Refactoring phase 1" into tizen

6 years agoNew TextUtilities interface. 95/35495/4
Victor Cebollada [Mon, 16 Feb 2015 14:27:50 +0000 (14:27 +0000)]
New TextUtilities interface.

Change-Id: I9ba573cceece22ff9339eead684027e9f2833096
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoButton Refactoring phase 1 31/35231/8
Heeyong Song [Wed, 11 Feb 2015 04:15:56 +0000 (13:15 +0900)]
Button Refactoring phase 1

Change-Id: I5a11de7cb39228882358f83f0d2028af0c3db2e6

6 years agoFixed TextLabel color 41/35441/1
Paul Wisbey [Sun, 15 Feb 2015 18:32:30 +0000 (18:32 +0000)]
Fixed TextLabel color

Change-Id: I8b1c2e4d55de2cc2d56a5e35257263314d1aaee8

6 years agoMerge remote-tracking branch 'origin/tizen' into new_text 33/35433/3
Paul Wisbey [Fri, 13 Feb 2015 17:36:36 +0000 (17:36 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
base/dali-toolkit/internal/file.list
base/dali-toolkit/public-api/file.list
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-handles-impl.h
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-input/text-input-popup-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
dali-toolkit/internal/controls/text-view/relayout-utilities.h
dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
dali-toolkit/internal/controls/text-view/split-by-char-policies.h
dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
dali-toolkit/internal/controls/text-view/split-by-word-policies.h
dali-toolkit/internal/controls/text-view/text-actor-cache.cpp
dali-toolkit/internal/controls/text-view/text-actor-cache.h
dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp
dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h
dali-toolkit/internal/controls/text-view/text-processor.cpp
dali-toolkit/internal/controls/text-view/text-processor.h
dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.h
dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
dali-toolkit/internal/controls/text-view/text-view-processor-types.h
dali-toolkit/internal/controls/text-view/text-view-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-processor.h
dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
dali-toolkit/internal/controls/text-view/text-view-word-processor.h
dali-toolkit/public-api/controls/text-input/text-input.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.cpp
dali-toolkit/public-api/controls/text-view/text-view.h
dali-toolkit/public-api/markup-processor/markup-processor.cpp
dali-toolkit/public-api/markup-processor/markup-processor.h

Change-Id: I9f3dcc5bba104f4cac0589eddad4ad1de31cc740

6 years agoMerge "Bidirectional support interface added." into new_text
Paul Wisbey [Fri, 13 Feb 2015 15:16:20 +0000 (07:16 -0800)]
Merge "Bidirectional support interface added." into new_text

6 years agoDeep Internal Documentation 75/35375/5
Andrew Cox [Thu, 12 Feb 2015 17:51:25 +0000 (17:51 +0000)]
Deep Internal Documentation

Call graphs, caller graphs, highlighted browsable source code ...

Change-Id: I66b31abdf91e1b78e2a93f9f0b4ebbfa9949f565
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
6 years agoMulti-language support implementation. 84/34984/11
Victor Cebollada [Wed, 4 Feb 2015 09:42:49 +0000 (09:42 +0000)]
Multi-language support implementation.

Change-Id: Ia6dee3e9e85f1a7ff2043eebbe3680967bf2fafc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoAdded some LayoutEngine skeleton code 50/35350/13
Paul Wisbey [Thu, 12 Feb 2015 11:35:25 +0000 (11:35 +0000)]
Added some LayoutEngine skeleton code

Change-Id: Ib3b99cd62311b937b2bab8bdc14133daf618bcc0

6 years agoBidirectional support interface added. 53/34753/6
Victor Cebollada [Mon, 2 Feb 2015 11:43:12 +0000 (11:43 +0000)]
Bidirectional support interface added.

Change-Id: I123154d9a17e2d4c1f9dcc60a8f3f73dee865ac6
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoText segmentation interface added. 56/34756/6
Victor Cebollada [Mon, 2 Feb 2015 12:10:34 +0000 (12:10 +0000)]
Text segmentation interface added.

Change-Id: I4053be3ea15a685278f28929d273ccc6a45e54ee
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge "Remove obsolete and non functional SizeChanged signal from actor" into tizen
Kimmo Hoikka [Thu, 12 Feb 2015 10:42:42 +0000 (02:42 -0800)]
Merge "Remove obsolete and non functional SizeChanged signal from actor" into tizen

6 years agoRemove obsolete and non functional SizeChanged signal from actor 85/35285/2
Kimmo Hoikka [Wed, 11 Feb 2015 13:24:00 +0000 (13:24 +0000)]
Remove obsolete and non functional SizeChanged signal from actor

Change-Id: Idf6252b4aac6fe3acf56b469f2a380c4e862a9cc

6 years agoMerge "Remove constraints from Popup, TableView, Alignment & ScrollBar" into tizen
Adeel Kazmi [Wed, 11 Feb 2015 11:43:17 +0000 (03:43 -0800)]
Merge "Remove constraints from Popup, TableView, Alignment & ScrollBar" into tizen

6 years agoDALi Version 1.0.29 66/35266/1 dali_1.0.29
Adeel Kazmi [Wed, 11 Feb 2015 10:13:22 +0000 (10:13 +0000)]
DALi Version 1.0.29

Change-Id: I04e3412887643968569ec84d93928a7ea599a799

6 years agoRemove constraints from Popup, TableView, Alignment & ScrollBar 81/35081/7
Xiangyin Ma [Fri, 6 Feb 2015 18:44:29 +0000 (18:44 +0000)]
Remove constraints from Popup, TableView, Alignment & ScrollBar

Change-Id: Icc87b6fc280a653f5fc5711c5f3bf624db5c5d18

6 years agoMethods to set/get font and script runs added to the text logical model. 12/35112/4
Victor Cebollada [Fri, 6 Feb 2015 17:37:26 +0000 (17:37 +0000)]
Methods to set/get font and script runs added to the text logical model.

Change-Id: Icae1eccf8971d324143cc60a9c1b7ab47702f94e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge remote-tracking branch 'origin/tizen' into new_text 49/35149/1
Paul Wisbey [Mon, 9 Feb 2015 18:27:18 +0000 (18:27 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit-unmanaged/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextInput.cpp
base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
base/dali-toolkit/internal/controls/text-input/text-input-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
base/dali-toolkit/internal/controls/text-view/text-view-impl.h
base/dali-toolkit/public-api/controls/text-input/text-input.cpp
base/dali-toolkit/public-api/controls/text-input/text-input.h
base/dali-toolkit/public-api/controls/text-view/text-view.cpp
base/dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I98c12cbab5fe05cdcc60b42c4eeeb34ffc9ac7cc

6 years agoMerge base & optional 46/35146/1
Adeel Kazmi [Mon, 9 Feb 2015 14:57:14 +0000 (14:57 +0000)]
Merge base & optional

Change-Id: Icd2bba5752711bb6f0b3932ede16ae2e274a0e6b

6 years agoremove (dead) ImageView UI control 23/35123/1
Kimmo Hoikka [Mon, 9 Feb 2015 12:06:20 +0000 (12:06 +0000)]
remove (dead) ImageView UI control

Change-Id: I59602642e8b7e6f6b934b49127d1210f635a6a86

6 years agoMerge "Basic text rendering back-end (reference implemenation)" into new_text
Paul Wisbey [Mon, 9 Feb 2015 11:17:33 +0000 (03:17 -0800)]
Merge "Basic text rendering back-end (reference implemenation)" into new_text

6 years agofixing some of the comments and changing copy-by-value to by reference in size negoti... 90/34990/8
Kimmo Hoikka [Fri, 6 Feb 2015 19:59:26 +0000 (19:59 +0000)]
fixing some of the comments and changing copy-by-value to by reference in size negotiation

Change-Id: I1eb8b787e0880083def5483bde4b95644047f4f6

6 years agoMerge "Remove Constraints from Cluster,ToolBar,View & ImageView" into tizen
Kimmo Hoikka [Fri, 6 Feb 2015 19:18:46 +0000 (11:18 -0800)]
Merge "Remove Constraints from Cluster,ToolBar,View & ImageView" into tizen

6 years ago(Magnifier) Synchronize the frame position with the viewport position 67/35067/1
Xiangyin Ma [Fri, 6 Feb 2015 15:27:25 +0000 (15:27 +0000)]
(Magnifier) Synchronize the frame position with the viewport position

Change-Id: I1094572097356d19f32e9bbfce7088482f3aaa38

6 years agoMulti-language support interface added. 60/34760/5
Victor Cebollada [Mon, 2 Feb 2015 12:25:20 +0000 (12:25 +0000)]
Multi-language support interface added.

Change-Id: I25501a88737fe1bfbc221266a27c6ae43a0774c3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge "DALi Version 1.0.28" into tizen accepted/tizen/common/20150209.122020 accepted/tizen/mobile/20150210.015343 accepted/tizen/mobile/20150306.082341 accepted/tizen/tv/20150210.013257 accepted/tizen/wearable/20150210.015027 dali_1.0.28 submit/tizen/20150206.152923 submit/tizen_mobile/20150213.000000 submit/tizen_mobile/20150223.000000 submit/tizen_mobile/20150306.011558
Paul Wisbey [Fri, 6 Feb 2015 13:54:04 +0000 (05:54 -0800)]
Merge "DALi Version 1.0.28" into tizen

6 years agoDALi Version 1.0.28 56/35056/1
Xiangyin Ma [Fri, 6 Feb 2015 11:51:25 +0000 (11:51 +0000)]
DALi Version 1.0.28

Change-Id: Iccdf4fa0f5a549793950df0b4ba3bc36b5d59d63

6 years agoBasic text rendering back-end (reference implemenation) 35/35035/6
Paul Wisbey [Fri, 6 Feb 2015 09:52:16 +0000 (09:52 +0000)]
Basic text rendering back-end (reference implemenation)

Change-Id: I85ea6478519fecbb48d37ed57b474921a1a3ff91

6 years ago(AutomatedTests) Merged managed and unmanaged tests 09/35009/1
Adeel Kazmi [Thu, 5 Feb 2015 20:08:55 +0000 (20:08 +0000)]
(AutomatedTests) Merged managed and unmanaged tests

Removed some redundant unmanaged Button tests. They are being refactored so need to be re-written
anyway.

Change-Id: I15a6c76652f9b893875cf1a7b52ab55af6f369e4

6 years agoChange FontMetrics format to match GlyphMetrics 45/34945/2
Paul Wisbey [Wed, 4 Feb 2015 15:58:38 +0000 (15:58 +0000)]
Change FontMetrics format to match GlyphMetrics

Change-Id: Ie098d4a45779b9952c670a78855c8cd54e44ad53