platform/core/uifw/dali-toolkit.git
9 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>
9 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>
9 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

9 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

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

9 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

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

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

9 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

9 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

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

9 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

9 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

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

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

9 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

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

9 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

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

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

9 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

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

9 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

9 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

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

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

9 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

9 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

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 65/36465/2
Paul Wisbey [Fri, 6 Mar 2015 16:12:34 +0000 (16:12 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
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-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-impl.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-word-processor.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I02bcdd172b1be75e3f6aa38c4dc8c55cdc076399

9 years agoProperty system fixes 73/36373/10
Paul Wisbey [Thu, 5 Mar 2015 12:57:05 +0000 (12:57 +0000)]
Property system fixes

Change-Id: I18cb303acbe1e96b60c987336c0aa9ed857a3ea3

9 years agoLayout implementation 30/36430/2
Victor Cebollada [Fri, 6 Mar 2015 08:35:52 +0000 (08:35 +0000)]
Layout implementation

Change-Id: Id9f6ca5cbd948a718c35d0856a9577ec86862568
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoProperty refactor in dali-toolkit: Toolkit changes 39/36139/6 accepted/tizen/common/20150309.091951 accepted/tizen/mobile/20150309.081750 accepted/tizen/tv/20150309.081812 accepted/tizen/wearable/20150309.110925 submit/tizen/20150309.074330
Tom Robinson [Mon, 2 Mar 2015 17:11:11 +0000 (17:11 +0000)]
Property refactor in dali-toolkit: Toolkit changes

Change-Id: I1af4c0d2a3983134256ac816cd89df9b138c93f5

9 years agoVisualModel fixes. 19/36419/3
Victor Cebollada [Fri, 6 Mar 2015 08:10:59 +0000 (08:10 +0000)]
VisualModel fixes.
  - Removes std::vector
  - Implements GetGlyphInfo()
  - Implements glyph to character and character to glyph conversion.

Change-Id: I8d6668ac80e010edf151253bd4867fb8e808b09b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoFix for Shaping. 15/36415/2
Victor Cebollada [Fri, 6 Mar 2015 07:49:03 +0000 (07:49 +0000)]
Fix for Shaping.
  - In a text with different scripts, the text is shaped in runs of
    characters with the same script. Adpator return the character
    index of each glyph starting always by 0. Toolkit was not
    updating the indices given by the adaptor for the runs after the
    first one.
  - characterIndices renamed to glyphsToCharactersMap.
  - Adaptor retrieves the glyphsToCharactersMap. Toolkit was setting
    the glyphsToCharactersMap to the charactersPerGlyph vector.

Change-Id: I9c74741fadb6d68bca29629ff79ed7bc48dd2840
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Property enum name changes in dali-core: Toolkit changes for compiling" into... submit/tizen/20150306.102558
Adeel Kazmi [Thu, 5 Mar 2015 16:16:54 +0000 (08:16 -0800)]
Merge "Property enum name changes in dali-core: Toolkit changes for compiling" into tizen

9 years agotest-platform-abstraction change by adding LoadShaderBinFile() of PlatformAbstraction 76/36376/1
taeyoon [Thu, 5 Mar 2015 14:28:31 +0000 (23:28 +0900)]
test-platform-abstraction change by adding LoadShaderBinFile() of PlatformAbstraction

 - LoadShaderBinFile() into test-platform-abstraction.h/cpp

Change-Id: Ife440014cc86a6c80102fbf0ade3a7c441c262b9

9 years agoMerge "Add IMPORT_DALI_API to item-layout" into tizen
Adeel Kazmi [Thu, 5 Mar 2015 12:55:24 +0000 (04:55 -0800)]
Merge "Add IMPORT_DALI_API to item-layout" into tizen

9 years agoProperty enum name changes in dali-core: Toolkit changes for compiling 46/36346/1
Tom Robinson [Thu, 5 Mar 2015 11:28:09 +0000 (11:28 +0000)]
Property enum name changes in dali-core: Toolkit changes for compiling

Change-Id: I9da79abb00fc7b700effb420af0a44fd6cd24d44

9 years agoTextLabel property fixes 40/36340/4
Paul Wisbey [Thu, 5 Mar 2015 09:39:37 +0000 (09:39 +0000)]
TextLabel property fixes

Change-Id: Iaadf7aa6c8dbb3560e790efe0018329b963224d9

9 years agoBuild JavaScript documentation during make 38/36338/2
Nick Holland [Wed, 4 Mar 2015 11:00:22 +0000 (11:00 +0000)]
Build JavaScript documentation during make

Also includes fix to build break after FRONT_... BACK_
anchor point constants removed.

Change-Id: I981b6375e8c425f506a5b2a36e1285d719204423

9 years agoPrepare for Tizen 2.4 API freeze 32/36332/4
Paul Wisbey [Thu, 5 Mar 2015 08:06:09 +0000 (08:06 +0000)]
Prepare for Tizen 2.4 API freeze

Change-Id: I109eec1cae19f0cf4c01aa8bfac8a10d54a9750f

9 years agoAdd IMPORT_DALI_API to item-layout 16/36316/1
daemyung jang [Thu, 5 Mar 2015 00:58:17 +0000 (09:58 +0900)]
Add IMPORT_DALI_API to item-layout

Change-Id: Iefde94b007442649cd9100587d71e8f69f2a0525

9 years agoOnly use 1 PanGestureDetector 15/36315/1
Paul Wisbey [Wed, 4 Mar 2015 19:35:12 +0000 (19:35 +0000)]
Only use 1 PanGestureDetector

Change-Id: I6aca21345f52196ac516177b104b75437f3bdb7f

9 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

9 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

9 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

9 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

9 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

9 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

9 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

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

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

9 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

9 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

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

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

9 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

9 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

9 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

9 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