platform/core/uifw/dali-toolkit.git
5 years agoReplace TextView with TextLabel 01/37601/2
Paul Wisbey [Tue, 31 Mar 2015 16:38:22 +0000 (17:38 +0100)]
Replace TextView with TextLabel

Change-Id: I302a122867fdb29481ea6b4433589e96c7d58bbe

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

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

Change-Id: I9434dea82975db3920716bd46a2eb5b7a89236d0

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

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

Change-Id: Ia0aff01756e6d803616d9c4eae82f405c6cb2c0f

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

Change-Id: If4d929680b55dc5fed9bd414cd17ce1fc305ad64
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoNew size negotiation 74/36274/13
Kingsley Stephens [Thu, 20 Nov 2014 12:55:55 +0000 (12:55 +0000)]
New size negotiation

Change-Id: I9867577af2cb5516f8342aa4835db32b42881da9

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

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

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

Change-Id: I438714012e5a5eab26a706cafbaa58d4c813ad07

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

Change-Id: I72bccc4a06bb3852ae16ec74cf4916dfce6a541f

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

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

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

Change-Id: I16bb203f37dd213924f795a4f5666b38bbecfc58

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

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

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

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

Change-Id: I5e077936976ae8cefa21ecb8537d6e10a857bb29

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

Change-Id: I1ee4e535a529e0803d07b484d950729172c788b7

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

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

Change-Id: I47b564fd3952ae272a6c823957a04a5ef30e8d72

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

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

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

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

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

Change-Id: I9d3f5c48f0e984d0626a0cf41b0ab2dcdd6d9516

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

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

Change-Id: I51c5e78b40d5fd641c040b9c8c2944894f94efe9

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

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

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

Change-Id: I27145106837a36133b6a994cd869c3b03adea5d9

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

Change-Id: I933caca09e5b4817216112aa187ccd485c963742

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

Change-Id: Ia2caf9462b4cd81a60830eb5259da8bdb5f3e20d

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

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

Conflicts:
build/tizen/configure.ac

Change-Id: Id18adef88fdd0edca9ccb6a1225ab4def1bedf32

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

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

Change-Id: Ia191f33ed1e4e5e30029c963c2dbbf78e96f87dd

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

Change-Id: Ie8db0c65ca884a7fb210013b555bc6b520322d69

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

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

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

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

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

Change-Id: If0162644da55505e4069af65cbf6f5d926f27c30

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

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

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

Change-Id: Ibdfee429b97aa6b342d3527371c8d7947ae2e11b

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

Change-Id: I44af4abb9095fa425fb9d2e809bca16305407842

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

5 years agoAlignment - Fix a pixel alignment issue with the center alignment. 13/37113/1
Victor Cebollada [Thu, 19 Mar 2015 10:53:35 +0000 (10:53 +0000)]
Alignment - Fix a pixel alignment issue with the center alignment.

Change-Id: Ib934bffb8237fb2bef8d5110b535fc950e787529
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoMerge remote-tracking branch 'origin/tizen' into new_text 09/37109/2
Paul Wisbey [Thu, 19 Mar 2015 09:55:27 +0000 (09:55 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-Builder.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-view/text-view-impl.cpp

Change-Id: Ibbbecdb2962e4f0cfce3ff0e7c91efcd8bfb2170

5 years agoUpdate README.md for automated-tests 50/36550/2
Yoonsang Lee [Tue, 10 Mar 2015 01:55:17 +0000 (10:55 +0900)]
Update README.md for automated-tests

Correct names of test sets.

Change-Id: If7c660626bf26f76471931d925eda9f73f4eeb9d

5 years agoBasic IMF->KeyEvent and scrolling support 87/36987/18
Paul Wisbey [Tue, 17 Mar 2015 19:14:26 +0000 (19:14 +0000)]
Basic IMF->KeyEvent and scrolling support

Change-Id: I3477eecc33299231920f7c8be06ae5e7d17e90a6

5 years agoText Alignment 50/37050/6
Victor Cebollada [Wed, 18 Mar 2015 09:55:04 +0000 (09:55 +0000)]
Text Alignment

Change-Id: Ifc246bd925e14a29ce65f90f8e1042b26c94a342
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoRemove redundant orientation settings as default camera already looks at stage 58/37058/1
Kimmo Hoikka [Wed, 18 Mar 2015 14:40:55 +0000 (14:40 +0000)]
Remove redundant orientation settings as default camera already looks at stage

Change-Id: I7dbe23324319e1ab1ca543b90574012bddd2cc1c

5 years agoMirroring bidirectional text. 85/36985/3
Victor Cebollada [Tue, 17 Mar 2015 18:09:07 +0000 (18:09 +0000)]
Mirroring bidirectional text.

Change-Id: Ie1392451f1aad81b05d7762b6838c14cccfc0913
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoMerge "Improved block detection for new atlases in text atlas renderer" into new_text
Paul Wisbey [Tue, 17 Mar 2015 19:00:22 +0000 (12:00 -0700)]
Merge "Improved block detection for new atlases in text atlas renderer" into new_text

5 years agoAdded IMF manager hooks 84/36984/2
Paul Wisbey [Tue, 17 Mar 2015 18:10:28 +0000 (18:10 +0000)]
Added IMF manager hooks

Change-Id: Id873a801a557604e7ff12018a8b4d07b802503da

5 years agoSeparate handling of events which modify the Model 51/36951/11
Paul Wisbey [Tue, 17 Mar 2015 11:04:53 +0000 (11:04 +0000)]
Separate handling of events which modify the Model

Change-Id: Ibe0cac51a33129f446f18faa88e2803d0c3928b5

5 years agoInternal text model inteface. 43/36943/6
Victor Cebollada [Tue, 17 Mar 2015 14:10:09 +0000 (14:10 +0000)]
Internal text model inteface.

Modify the internal interface of the text's logical and visual
model to access the data directly without copying it.

Change-Id: I3de4509653c473cf03c70c96474dd78bcd3aaa50
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoActor's Transformation API Cleanup 26/36426/5
Yoonsang Lee [Fri, 6 Mar 2015 08:52:37 +0000 (17:52 +0900)]
Actor's Transformation API Cleanup

Update for following changes in dali-core:
Actor::MoveBy                     -> Actor::TranslateBy
Actor::ColorBy                    -> <removed>
Actor::OpacityBy                  -> <removed>
Actor::SetRotation                -> Actor::SetOrientation
Actor::GetCurrentRotation         -> Actor::GetCurrentOrientation
Actor::GetCurrentWorldRotation    -> Actor::GetCurrentWorldOrientation
Actor::SetInheritRotation         -> Actor::SetInheritOrientation
Actor::IsRotationInherited        -> Actor::IsOrientationInherited
Actor::Property::ROTATION         -> Actor::Property::ORIENTATION
Actor::Property::WORLD_ROTATION   -> Actor::Property::WORLD_ORIENTATION
Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION

Change-Id: Ie30c5da5c90167d6d0761510e2c67d5d2da259d7

5 years agoBreak-up the Relayout method 41/36941/1
Paul Wisbey [Tue, 17 Mar 2015 09:09:41 +0000 (09:09 +0000)]
Break-up the Relayout method

Change-Id: I55ed27274e9665ea0a1421d804cc021993be009a

5 years agoAdded some keyboard & cursor plumbing 92/36892/5
Paul Wisbey [Mon, 16 Mar 2015 15:00:22 +0000 (15:00 +0000)]
Added some keyboard & cursor plumbing

Change-Id: Id7db01da8f8476f56873b5f97a5e07e046882fe9

5 years agoImproved block detection for new atlases in text atlas renderer 46/36846/3
Richard Underhill [Mon, 16 Mar 2015 17:02:16 +0000 (17:02 +0000)]
Improved block detection for new atlases in text atlas renderer

Change-Id: I4bc3b24cb625d908c0613daaa38ae406f4552c61
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoAdded pixel padding to image upload through Atlas manager 86/36886/1
Richard Underhill [Mon, 16 Mar 2015 14:21:30 +0000 (14:21 +0000)]
Added pixel padding to image upload through Atlas manager

Change-Id: I5af112017044aa12d466736df7aface1720aa337
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoMerge "Use Fonts from property system" into new_text
Paul Wisbey [Mon, 16 Mar 2015 13:26:16 +0000 (06:26 -0700)]
Merge "Use Fonts from property system" into new_text

5 years agoUse Fonts from property system 11/36811/12
Paul Wisbey [Sun, 15 Mar 2015 14:33:39 +0000 (14:33 +0000)]
Use Fonts from property system

Change-Id: If849096ccfedca212670f05aa5db7dbd6d568fe5

5 years agoMerge "Updated programming guide for Properties" into tizen
Adeel Kazmi [Mon, 16 Mar 2015 10:10:28 +0000 (03:10 -0700)]
Merge "Updated programming guide for Properties" into tizen

5 years agoFixes for Utf32 to Utf8 conversion 44/36844/2
Victor Cebollada [Mon, 16 Mar 2015 09:14:04 +0000 (09:14 +0000)]
Fixes for Utf32 to Utf8 conversion
  The utf8 string was defined with a uint32 instead a uint8.
  Return the number of bytes of the utf8 string.

Change-Id: I8d6c77f6a02e509a515abff500a4a436789947fe
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoFramework for Font styles 10/36810/7
Paul Wisbey [Sun, 15 Mar 2015 13:02:20 +0000 (13:02 +0000)]
Framework for Font styles

Change-Id: Ia99b027f43ab0b2787d15c07dfb7cfd3c4a24473

5 years agoMerge "Added documentation markdown guide" into tizen
Adeel Kazmi [Fri, 13 Mar 2015 15:29:41 +0000 (08:29 -0700)]
Merge "Added documentation markdown guide" into tizen

5 years agoMerge "Removal of LITE profile" into tizen
Adeel Kazmi [Fri, 13 Mar 2015 15:23:46 +0000 (08:23 -0700)]
Merge "Removal of LITE profile" into tizen

5 years agoAdded documentation markdown guide 64/36464/5
Nick Holland [Fri, 6 Mar 2015 15:39:50 +0000 (15:39 +0000)]
Added documentation markdown guide

Change-Id: I8cbb65d434b74b60f4cf5c62c8d4865c4d7c97eb

5 years agoRemove unused ItemView layouts 88/36788/2
Richard Huang [Fri, 13 Mar 2015 12:01:08 +0000 (12:01 +0000)]
Remove unused ItemView layouts

Change-Id: Ie4087d1f28b6696cad2684bf28e4bc089bed1617

5 years agoUpdated programming guide for Properties 37/36537/10
Tom Robinson [Mon, 9 Mar 2015 16:22:51 +0000 (16:22 +0000)]
Updated programming guide for Properties

Change-Id: Ie96b72c4f4f2f22edaca653fe435de1dd937dcbb

5 years agoRemoval of LITE profile 65/36765/2
taeyoon [Fri, 13 Mar 2015 06:44:32 +0000 (15:44 +0900)]
Removal of LITE profile

Change-Id: I551a4dbd065312c07e9ac5e4356adfae34b4f961

5 years agoMerge remote-tracking branch 'origin/tizen' into new_text 84/36784/1
Paul Wisbey [Fri, 13 Mar 2015 11:01:52 +0000 (11:01 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I4ccad81fa1733cd86a88f667354d643b0e04fef0

5 years agoMerge "TextModel interface" into new_text
Paul Wisbey [Fri, 13 Mar 2015 10:58:56 +0000 (03:58 -0700)]
Merge "TextModel interface" into new_text

5 years agoChange "SLP" to "Tizen" 74/36774/1
taeyoon [Fri, 13 Mar 2015 09:17:51 +0000 (18:17 +0900)]
Change "SLP" to "Tizen"

Change-Id: I7464f5a9ef0b3b2fc7fb6fbbc06c8bfb437e4f62

5 years agoTextModel interface 43/33343/18
Victor Cebollada [Thu, 8 Jan 2015 10:27:34 +0000 (10:27 +0000)]
TextModel interface

Change-Id: Ia84327256c54e13023b1c804731614bfd928ba5d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoRemoved some pointless setters 50/36750/1
Paul Wisbey [Thu, 12 Mar 2015 17:07:34 +0000 (17:07 +0000)]
Removed some pointless setters

Change-Id: I278a3a9d4ae30f2d25ee972d6864d586d3482d49

5 years agoMerge "Text Rendering via Atlas Renderer" into new_text
Paul Wisbey [Thu, 12 Mar 2015 16:57:41 +0000 (09:57 -0700)]
Merge "Text Rendering via Atlas Renderer" into new_text

5 years agoMerge "Reduce Popup layers, parent to same actor as other decorations" into new_text
Paul Wisbey [Thu, 12 Mar 2015 16:37:05 +0000 (09:37 -0700)]
Merge "Reduce Popup layers, parent to same actor as other decorations" into new_text

5 years agoBidirectional Implementation for one line of text. 67/36667/6
Victor Cebollada [Wed, 18 Feb 2015 17:24:12 +0000 (17:24 +0000)]
Bidirectional Implementation for one line of text.

Change-Id: I1480364c36e1ff4531dea494e4a8960c75a56242
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoText Rendering via Atlas Renderer 87/36387/6
Richard Underhill [Thu, 12 Mar 2015 13:39:33 +0000 (13:39 +0000)]
Text Rendering via Atlas Renderer

Change-Id: I7fe87403467f2f9e979935d217a34569d2ebe36b
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoLogical model. 77/36577/7
Victor Cebollada [Mon, 9 Mar 2015 16:42:44 +0000 (16:42 +0000)]
Logical model.
  Caches the GetScriptRun() and GetFontRun() calls to use the cached values
  in the GetScriptRuns() and the GetFontRuns() calls.

Change-Id: I0c3408dab1ada3baf2f64be78e384ada8e71ff37
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoReduce Popup layers, parent to same actor as other decorations 35/36735/3
Agnelo Vaz [Thu, 12 Mar 2015 11:06:42 +0000 (11:06 +0000)]
Reduce Popup layers, parent to same actor as other decorations

Change-Id: Ie333ecbdb9a110d817d3029ccab6da0cf352eaa6
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
5 years agoCorrected camel case for BgraShader 45/36745/1
Richard Underhill [Thu, 12 Mar 2015 14:18:38 +0000 (14:18 +0000)]
Corrected camel case for BgraShader

Change-Id: If8c8939d8739d0fba5897e71643ffe3f4592a28e
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoClipping support for TextField 08/36608/17
Paul Wisbey [Tue, 10 Mar 2015 15:08:41 +0000 (15:08 +0000)]
Clipping support for TextField

Change-Id: Idd630cbf9067007c26344a36610a68f8a40a6b06

5 years agoDALi Version 1.0.33 22/36722/1 dali_1.0.33
Nick Holland [Thu, 12 Mar 2015 09:23:16 +0000 (09:23 +0000)]
DALi Version 1.0.33

Change-Id: Ie5fc020fb2b7b9bde369ea4fbc6c263a4f55d998

5 years agoAdding CopyPaste Popup and Decorator showing it. 11/36611/6
Agnelo Vaz [Mon, 9 Mar 2015 14:10:23 +0000 (14:10 +0000)]
Adding CopyPaste Popup and Decorator showing it.

Change-Id: I5a021abfefac450413ad6042af09ca86f775b4d0
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
5 years agoPrefer color Emoji by default 65/36665/3 new_text_0.1
Paul Wisbey [Wed, 11 Mar 2015 12:53:33 +0000 (12:53 +0000)]
Prefer color Emoji by default

Change-Id: Ic73eb25ce7c9ee2635db9becfe5779111f4a2f83

5 years agoSelect BGRA shader for colored emojis 10/36610/3
Richard Underhill [Tue, 10 Mar 2015 16:11:23 +0000 (16:11 +0000)]
Select BGRA shader for colored emojis

Change-Id: Ic85b2235c4eae0f4fdfa99c3fb057559795388b7
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoFixed build break 56/36656/1
Paul Wisbey [Wed, 11 Mar 2015 10:51:03 +0000 (10:51 +0000)]
Fixed build break

Change-Id: If273de0d6474c8f955fa7cd28f93ae59ec895e57

5 years agoRemove unused FindActorByAlias 14/36614/2
Kimmo Hoikka [Tue, 10 Mar 2015 17:33:43 +0000 (17:33 +0000)]
Remove unused FindActorByAlias

Change-Id: I6838d61433ebcf1c84d4d42846ca7abf7a8d5d1c

5 years agoMove text script code to adaptor. 07/36607/3
Victor Cebollada [Tue, 10 Mar 2015 14:19:34 +0000 (14:19 +0000)]
Move text script code to adaptor.

Change-Id: Ib4427dde44f13573e40f66f8323109cc58fbc1b1
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoMerge "TextModel - Clear the buffers if the number of items is zero." into new_text
Paul Wisbey [Tue, 10 Mar 2015 14:13:45 +0000 (07:13 -0700)]
Merge "TextModel - Clear the buffers if the number of items is zero." into new_text

5 years agoMerge "Lines added to the model." into new_text
Paul Wisbey [Tue, 10 Mar 2015 13:46:34 +0000 (06:46 -0700)]
Merge "Lines added to the model." into new_text

5 years agoBasicRenderer reworked for RGBA8888 82/36582/6
Paul Wisbey [Tue, 10 Mar 2015 09:26:05 +0000 (09:26 +0000)]
BasicRenderer reworked for RGBA8888

Change-Id: I39ea80c1c862adf8d5b5e715bc97f425c66da386

5 years agoTextModel - Clear the buffers if the number of items is zero. 84/36584/2
Victor Cebollada [Tue, 10 Mar 2015 09:35:10 +0000 (09:35 +0000)]
TextModel - Clear the buffers if the number of items is zero.

Change-Id: Ib5a7ee7d88b094b5cd8f82a0007a64f8bcde3237
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoFixed crash when Visual model positions < glyphs 78/36578/3
Paul Wisbey [Tue, 10 Mar 2015 08:25:42 +0000 (08:25 +0000)]
Fixed crash when Visual model positions < glyphs

Change-Id: I61398d876cc3614d97487a5c02c0dd51201f3420

5 years agoLines added to the model. 32/36532/6
Victor Cebollada [Thu, 26 Feb 2015 10:40:01 +0000 (10:40 +0000)]
Lines added to the model.

Change-Id: Ie80d79ad0ab7b050d4871a9f95d633f0fbdbc970
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoTextController fix. 34/36434/6
Victor Cebollada [Fri, 6 Mar 2015 09:26:01 +0000 (09:26 +0000)]
TextController fix.
  - Fixes the sequence of operations done for the GetNaturalSize(),
    GetHeightForWidth() and Relayout() methods avoiding redo the
    same tasks more than once.

Change-Id: If42b480667469b848dc2618bc11192e787a755c8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
5 years agoCorrected UTF-8 to UTF-32 conversion 11/36511/2
Richard Underhill [Mon, 9 Mar 2015 10:56:42 +0000 (10:56 +0000)]
Corrected UTF-8 to UTF-32 conversion

Change-Id: I2d6485b7cecb4e1dce451eab5f3c9a0026e93852
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
5 years agoAdded script value for Emoji 82/36482/8
Paul Wisbey [Sun, 8 Mar 2015 16:25:48 +0000 (16:25 +0000)]
Added script value for Emoji

Change-Id: Ieba0efd4ca452dbf9f384af8961b91a745b3e5ac

5 years agoKeyEvent passing mechanism 79/36479/6
Paul Wisbey [Sun, 8 Mar 2015 11:40:26 +0000 (11:40 +0000)]
KeyEvent passing mechanism

Change-Id: Ieba701f10bcb3b1e44bcdaf593b8684b8eaa8d03

5 years agodali-toolkit property type comment to represent type instead of property enum 70/36470/1 accepted/tizen/common/20150310.094727 accepted/tizen/mobile/20150310.122230 accepted/tizen/tv/20150310.092414 accepted/tizen/wearable/20150310.114543 submit/tizen/20150310.084835
Tom Robinson [Fri, 6 Mar 2015 17:58:12 +0000 (17:58 +0000)]
dali-toolkit property type comment to represent type instead of property enum

Change-Id: I58ce015f18dc309f4d7f3fd7b84a2e7dd488e436