projects / platform / core / uifw / dali-toolkit.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
platform/core/uifw/dali-toolkit.git
9 years agoAdded Property for the rendering back-end 76/36076/7
commit | commitdiff | tree
Paul Wisbey [Sat, 28 Feb 2015 18:51:18 +0000 (18:51 +0000)]
Added Property for the rendering back-end

Change-Id: I17562b649bb8be0fc7038a0a5e3fb9becd6fc94a

9 years agoMerge "Added interface for queuing input events in TextController" into new_text
commit | commitdiff | tree
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

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

Change-Id: I66c96382884a6fa607eea5a6eb87a8f929366362

9 years agoFixes for Shaping. Do not shape \n characters. 40/35940/3
commit | commitdiff | tree
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>
9 years agoFixes for multi-language. 39/35939/3
commit | commitdiff | tree
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>
9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 88/35888/3
commit | commitdiff | tree
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

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

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

Change-Id: I6d9d349a02f2243887f2e92af671c727be0ca04c

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

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

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

Change-Id: Idc65f3e14554895641b178c04048ffa2f63e92d4

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

Change-Id: Ib30eca2376d5927f52e4c06cb93dd65c903a629e

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

Change-Id: Ia13e9eaa9644af5295ed3c05737019d8bc9f23b7

9 years agoAdded shader effect to render quadratic bezier curves and bounded regions on the GPU 96/35696/4
commit | commitdiff | tree
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

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

Change-Id: I316b5d62f4c31b38740067186d29dc4cb5cf0767

9 years agoMerge "(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo...
commit | commitdiff | tree
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

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

9 years agoMerge "Addition of build flag "-Wl,-Bsymbolic-functions" for launching performance...
commit | commitdiff | tree
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

9 years ago(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo) while... 97/35697/2
commit | commitdiff | tree
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

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

Change-Id: I890cc03cca27374fb2a2d9c8645c86b0a19738c5

9 years agoAddition of build flag "-Wl,-Bsymbolic-functions" for launching performance 82/35682/1
commit | commitdiff | tree
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

9 years agoTextLabel::GetHeightForWidth() implementation. 36/35636/2
commit | commitdiff | tree
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>
9 years agoSpecial characters added to the script. 22/35622/3
commit | commitdiff | tree
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>
9 years agoInclude <string> to compensate for core inclusion cleanup 98/35598/4
commit | commitdiff | tree
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>
9 years agoMerge "Typo fixed in Control implementation doc." into tizen
commit | commitdiff | tree
Adeel Kazmi [Thu, 19 Feb 2015 10:35:36 +0000 (02:35 -0800)]
Merge "Typo fixed in Control implementation doc." into tizen

9 years agoTypo fixed in Control implementation doc. 09/35609/1
commit | commitdiff | tree
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>
9 years agoMerge "Remove unnecessarily exported signals and action names" into tizen
commit | commitdiff | tree
Adeel Kazmi [Wed, 18 Feb 2015 17:39:28 +0000 (09:39 -0800)]
Merge "Remove unnecessarily exported signals and action names" into tizen

9 years agoTextModel interface. 35/34835/7
commit | commitdiff | tree
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>
9 years agoShaper implementation 14/35214/6
commit | commitdiff | tree
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>
9 years agoMerge "DALi Version 1.0.30" into tizen
commit | commitdiff | tree
Adeel Kazmi [Wed, 18 Feb 2015 15:18:24 +0000 (07:18 -0800)]
Merge "DALi Version 1.0.30" into tizen

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

Change-Id: Ic6b45ba22e0e4f5d3850aaf257d7c14b3d1c30fa

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

Change-Id: Iffe4621c04d06cb98eaec6cd84b69fa520f3b492

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

Change-Id: I8bc67f3b0c781f0f5c30f3576972ff1008c8c16c

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

Change-Id: Ia9fdbdb2b2635a6358a490103b1d5fcf9b117bca

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

Change-Id: Ia56f0e6f012264807bb575c5dff08b1d87b6cc8b

9 years agoText segmentation implementation 76/35476/2
commit | commitdiff | tree
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>
9 years agoMerge "Button Refactoring phase 1" into tizen submit/tizen/20150217.020310
commit | commitdiff | tree
Adeel Kazmi [Mon, 16 Feb 2015 17:33:20 +0000 (09:33 -0800)]
Merge "Button Refactoring phase 1" into tizen

9 years agoNew TextUtilities interface. 95/35495/4
commit | commitdiff | tree
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>
9 years agoButton Refactoring phase 1 31/35231/8
commit | commitdiff | tree
Heeyong Song [Wed, 11 Feb 2015 04:15:56 +0000 (13:15 +0900)]
Button Refactoring phase 1

Change-Id: I5a11de7cb39228882358f83f0d2028af0c3db2e6

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

Change-Id: I8b1c2e4d55de2cc2d56a5e35257263314d1aaee8

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 33/35433/3
commit | commitdiff | tree
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

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

9 years agoDeep Internal Documentation 75/35375/5
commit | commitdiff | tree
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>
9 years agoMulti-language support implementation. 84/34984/11
commit | commitdiff | tree
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>
9 years agoAdded some LayoutEngine skeleton code 50/35350/13
commit | commitdiff | tree
Paul Wisbey [Thu, 12 Feb 2015 11:35:25 +0000 (11:35 +0000)]
Added some LayoutEngine skeleton code

Change-Id: Ib3b99cd62311b937b2bab8bdc14133daf618bcc0

9 years agoBidirectional support interface added. 53/34753/6
commit | commitdiff | tree
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>
9 years agoText segmentation interface added. 56/34756/6
commit | commitdiff | tree
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>
9 years agoMerge "Remove obsolete and non functional SizeChanged signal from actor" into tizen
commit | commitdiff | tree
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

9 years agoRemove obsolete and non functional SizeChanged signal from actor 85/35285/2
commit | commitdiff | tree
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

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

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

Change-Id: I04e3412887643968569ec84d93928a7ea599a799

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

Change-Id: Icc87b6fc280a653f5fc5711c5f3bf624db5c5d18

9 years agoMethods to set/get font and script runs added to the text logical model. 12/35112/4
commit | commitdiff | tree
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>
9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 49/35149/1
commit | commitdiff | tree
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

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

Change-Id: Icd2bba5752711bb6f0b3932ede16ae2e274a0e6b

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

Change-Id: I59602642e8b7e6f6b934b49127d1210f635a6a86

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

9 years agofixing some of the comments and changing copy-by-value to by reference in size negoti... 90/34990/8
commit | commitdiff | tree
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

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

9 years ago(Magnifier) Synchronize the frame position with the viewport position 67/35067/1
commit | commitdiff | tree
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

9 years agoMulti-language support interface added. 60/34760/5
commit | commitdiff | tree
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>
9 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
commit | commitdiff | tree
Paul Wisbey [Fri, 6 Feb 2015 13:54:04 +0000 (05:54 -0800)]
Merge "DALi Version 1.0.28" into tizen

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

Change-Id: Iccdf4fa0f5a549793950df0b4ba3bc36b5d59d63

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

Change-Id: I85ea6478519fecbb48d37ed57b474921a1a3ff91

9 years ago(AutomatedTests) Merged managed and unmanaged tests 09/35009/1
commit | commitdiff | tree
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

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

Change-Id: Ie098d4a45779b9952c670a78855c8cd54e44ad53

9 years agoRemove Constraints from Cluster,ToolBar,View & ImageView 49/34949/3
commit | commitdiff | tree
Xiangyin Ma [Wed, 4 Feb 2015 18:37:06 +0000 (18:37 +0000)]
Remove Constraints from Cluster,ToolBar,View & ImageView

Change-Id: I1225da0795796717dc750a5ff5a91f96225e3a72

9 years agoRemove constaints from BloomView, GaussianBlurView & Magnifier 54/34854/3 accepted/tizen/common/20150209.121015 accepted/tizen/mobile/20150211.014648 accepted/tizen/tv/20150210.012936 accepted/tizen/wearable/20150210.014752 submit/tizen/20150206.044231
commit | commitdiff | tree
Xiangyin Ma [Tue, 3 Feb 2015 13:20:56 +0000 (13:20 +0000)]
Remove constaints from BloomView, GaussianBlurView & Magnifier

Change-Id: Ie4dbec178de2c6644fddd459e5d6acd21f26ae7a

9 years ago(Buttons) Fix build break for automated tests & remove unused function 91/34991/2
commit | commitdiff | tree
Adeel Kazmi [Thu, 5 Feb 2015 11:59:00 +0000 (11:59 +0000)]
(Buttons) Fix build break for automated tests & remove unused function

Change-Id: Ib149b289fe93425f888598247f17f4415aac47d8

9 years agoAdded skeleton TextController 68/34768/10
commit | commitdiff | tree
Paul Wisbey [Mon, 2 Feb 2015 14:50:06 +0000 (14:50 +0000)]
Added skeleton TextController

Change-Id: I8bab60c53d11a95764fb22ca89190e202e9f603f

9 years agoButton refactoring: rename properties 72/34872/1 submit/tizen/20150205.132635
commit | commitdiff | tree
Heeyong Song [Wed, 4 Feb 2015 03:01:28 +0000 (12:01 +0900)]
Button refactoring: rename properties

Change-Id: I4ed5ecb962efe9c85cf1a2941d22478a3de7aec2

9 years agoRemove dead slide effect code and incorrect ref-objects from scroll effects 90/34790/2 tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common accepted/tizen/common/20150205.080848 submit/tizen/20150205.011244
commit | commitdiff | tree
Kimmo Hoikka [Mon, 2 Feb 2015 18:15:24 +0000 (18:15 +0000)]
Remove dead slide effect code and incorrect ref-objects from scroll effects

Change-Id: I65568f41211f4810c407118dffe74db6a7877888

9 years agoText definitions added/modified 67/34767/2
commit | commitdiff | tree
Victor Cebollada [Mon, 2 Feb 2015 14:17:03 +0000 (14:17 +0000)]
Text definitions added/modified

Change-Id: I56491acd5c1da431b6828a9e5450b49c8b445924
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoUTF8 to UTF32 conversion 09/34009/4
commit | commitdiff | tree
Victor Cebollada [Mon, 19 Jan 2015 14:17:52 +0000 (14:17 +0000)]
UTF8 to UTF32 conversion

Change-Id: I19e32d4dd13c127bbf308605ea8c04e636c9c049
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoText Renderer base class & TextLabel skeleton 46/34746/3
commit | commitdiff | tree
Paul Wisbey [Mon, 2 Feb 2015 09:30:00 +0000 (09:30 +0000)]
Text Renderer base class & TextLabel skeleton

Change-Id: Ief7e9491bb3b3abb130710b195a30e94a550e5e0

9 years agoAdded ViewInterface to build 14/34714/1
commit | commitdiff | tree
Paul Wisbey [Sun, 1 Feb 2015 13:13:23 +0000 (13:13 +0000)]
Added ViewInterface to build

Change-Id: I6de66ba0496141de688d46b89f83674e37bef085

9 years agoDALi signals refactor to remove V2 naming 02/34702/2
commit | commitdiff | tree
tom.robinson [Fri, 30 Jan 2015 16:27:07 +0000 (16:27 +0000)]
DALi signals refactor to remove V2 naming

Change-Id: Ib01d807a8ed6b9b40b438995b2a1bca889655ce7

9 years agoMinimal Model/View implementation 16/34616/6
commit | commitdiff | tree
Paul Wisbey [Thu, 29 Jan 2015 12:45:32 +0000 (12:45 +0000)]
Minimal Model/View implementation

Change-Id: I2f86ec7cb6a3174c4ed70b3925f94c2501403141

9 years agoMerge "DALi Version 1.0.27" into tizen
commit | commitdiff | tree
Adeel Kazmi [Thu, 29 Jan 2015 11:18:40 +0000 (03:18 -0800)]
Merge "DALi Version 1.0.27" into tizen

9 years agoDALi Version 1.0.27 97/34597/1 accepted/tizen/common/20150129.162030 accepted/tizen/mobile/20150130.001255 accepted/tizen/tv/20150130.000842 accepted/tizen/wearable/20150131.040511 dali_1.0.27 submit/tizen/20150129.112343
commit | commitdiff | tree
tom.robinson [Thu, 29 Jan 2015 10:59:15 +0000 (10:59 +0000)]
DALi Version 1.0.27

Change-Id: I37b8cdcd65a1a130e8302e693bf353c59295e837

9 years agoremove constaints from EffectsView & Image Filters 24/34524/1
commit | commitdiff | tree
Xiangyin Ma [Wed, 28 Jan 2015 15:37:00 +0000 (15:37 +0000)]
remove constaints from EffectsView & Image Filters

Change-Id: I992366ec2c8b6897ddf35bd7a46e41642e57aba1

9 years ago(Automated Tests) Removed ClipboardEventNotifier signal name 68/34468/2
commit | commitdiff | tree
Adeel Kazmi [Tue, 27 Jan 2015 16:00:21 +0000 (16:00 +0000)]
(Automated Tests) Removed ClipboardEventNotifier signal name

Change-Id: If2d3b2f566180313dfc98d65a677385a4b74b1eb

9 years agoRevert "Revert "Remove ScrollViewCustomEffect"" 92/34392/2
commit | commitdiff | tree
Kingsley Stephens [Mon, 26 Jan 2015 11:38:24 +0000 (03:38 -0800)]
Revert "Revert "Remove ScrollViewCustomEffect""

This reverts commit b5d9f1a0d6f33823cd19b5505ffe72d61a0735c6.

This code will now be removed.

Change-Id: I45554a9e3fb1c94a5ad4d80822f4a2118062baa6

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 77/34377/1
commit | commitdiff | tree
Paul Wisbey [Mon, 26 Jan 2015 09:08:10 +0000 (09:08 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I22c07acab710d400f7103df9be66c622f38f3cad

9 years agoDALi Version 1.0.26 53/34253/1 accepted/tizen/common/20150123.092452 accepted/tizen/common/20150123.135213 accepted/tizen/mobile/20150126.011910 accepted/tizen/tv/20150126.011342 accepted/tizen/wearable/20150126.011558 dali_1.0.26 submit/tizen/20150122.143209 submit/tizen/20150123.103753
commit | commitdiff | tree
Nick Holland [Thu, 22 Jan 2015 10:48:31 +0000 (10:48 +0000)]
DALi Version 1.0.26

Change-Id: I1a59eb426dddc8f388b16e5ca4f3e3f81924b513

9 years agoRevert "Remove ScrollViewCustomEffect" 89/33989/2
commit | commitdiff | tree
Kingsley Stephens [Mon, 19 Jan 2015 11:48:45 +0000 (03:48 -0800)]
Revert "Remove ScrollViewCustomEffect"

This reverts commit 97b1d370bbe662d6f2b813252b281e77926aa037.

Change-Id: I52298b7081158275ed78e5c140b329331d9ae937

9 years agoRemoval of a 'sec_build_binary_debug_enable' part in spec file 09/33909/1
commit | commitdiff | tree
taeyoon [Fri, 16 Jan 2015 10:14:08 +0000 (19:14 +0900)]
Removal of a 'sec_build_binary_debug_enable' part in spec file

  - 'sec_build_binary_debug_enable and -DTIZEN_DEBUG_ENABLE' are not used.

Change-Id: Id04197def4ffdef29865d66b22ca8390752284cb

9 years agoMerge "DALi Version 1.0.25" into tizen dali_1.0.25
commit | commitdiff | tree
Paul Wisbey [Thu, 15 Jan 2015 13:51:29 +0000 (05:51 -0800)]
Merge "DALi Version 1.0.25" into tizen

9 years agoDALi Version 1.0.25 42/33842/1
commit | commitdiff | tree
Xiangyin Ma [Thu, 15 Jan 2015 13:20:58 +0000 (13:20 +0000)]
DALi Version 1.0.25

Change-Id: Icc6156854cf26000901b91149032a3be6ce40d0f

9 years agoScroll to the end of overshoot only when overshoot is enabled 78/33778/1
commit | commitdiff | tree
Richard Huang [Wed, 14 Jan 2015 16:14:22 +0000 (16:14 +0000)]
Scroll to the end of overshoot only when overshoot is enabled

Change-Id: I9e2881dc5d52c28d13ec7dd132ed3c0cc570baed

9 years agoMerge "Change overshoot to have constant speed as a property" into tizen
commit | commitdiff | tree
Kimmo Hoikka [Fri, 9 Jan 2015 15:44:53 +0000 (07:44 -0800)]
Merge "Change overshoot to have constant speed as a property" into tizen

9 years agoRemove ScrollViewCustomEffect 54/33354/2
commit | commitdiff | tree
Kingsley Stephens [Wed, 7 Jan 2015 10:31:31 +0000 (10:31 +0000)]
Remove ScrollViewCustomEffect

Change-Id: I0b4916205043cadfe349e2cc2f6bc5d5b9bc8cdc

9 years agoChange overshoot to have constant speed as a property 60/31960/7
commit | commitdiff | tree
Richard Huang [Fri, 12 Dec 2014 15:10:42 +0000 (15:10 +0000)]
Change overshoot to have constant speed as a property

Change-Id: Ie5264aa8950713b9c62be2689f57dfe3adb199da

9 years agoDALi Version 1.0.24 61/33361/1 dali_1.0.24
commit | commitdiff | tree
Lee Morgan [Thu, 8 Jan 2015 14:41:41 +0000 (14:41 +0000)]
DALi Version 1.0.24

Change-Id: I81c012e8800fcc7538ab2b7541c5f3405c0b29d2

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 57/33257/1
commit | commitdiff | tree
Paul Wisbey [Wed, 7 Jan 2015 10:12:50 +0000 (10:12 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Relayout-Utilities.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp

Change-Id: I03204cfe486d6b861d970676b9db41749c6236eb

9 years agoDALi Version 1.0.23 10/32810/1 dali_1.0.23
commit | commitdiff | tree
Adeel Kazmi [Wed, 24 Dec 2014 10:43:56 +0000 (10:43 +0000)]
DALi Version 1.0.23

Change-Id: I903f1e4eb30a1fb01cc2a99c65eb729b6975ccc4

9 years agoInitial removal of Text features 98/32598/6
commit | commitdiff | tree
Paul Wisbey [Fri, 19 Dec 2014 09:45:05 +0000 (09:45 +0000)]
Initial removal of Text features

Change-Id: I900965567d917695882fead0b5a14e8dc2f64da2

9 years ago(ItemView) Fix Klocwork reported issue 04/32604/1 accepted/tizen/mobile/20141222.135816 accepted/tizen/tv/20141222.125620 accepted/tizen/wearable/20141222.134841 submit/tizen_mobile/20141222.110445 submit/tizen_tv/20141222.110455 submit/tizen_wearable/20141222.110450
commit | commitdiff | tree
Adeel Kazmi [Fri, 19 Dec 2014 11:56:52 +0000 (11:56 +0000)]
(ItemView) Fix Klocwork reported issue

[Problem]  Reverse_iter is dereferenced before we check if it's valid.
[Solution] Check if it's valid before we use it.

Change-Id: I96bdd0c30d35faf8c9a31507925218ed4b372a23

9 years agoSaving a bit of memory by using pretty function instead of full file name 14/32414/3 accepted/tizen/common/20141222.090212 submit/tizen_common/20141218.164254
commit | commitdiff | tree
Kimmo Hoikka [Wed, 17 Dec 2014 19:13:16 +0000 (19:13 +0000)]
Saving a bit of memory by using pretty function instead of full file name

Change-Id: I5d0041855016083f3238b6155ef5a5efa4985531

9 years agoDALi Version 1.0.22 66/32466/1 dali_1.0.22
commit | commitdiff | tree
Kingsley Stephens [Thu, 18 Dec 2014 10:09:44 +0000 (10:09 +0000)]
DALi Version 1.0.22

Change-Id: I84425ee1eda9eb4ea0e6eb2696adb9b15109d297

next
Domain: Graphics System / DALi;