Paul Wisbey [Mon, 16 Mar 2015 14:36:34 +0000 (14:36 +0000)]
Respect the accessibility settings
Change-Id: I51c5e78b40d5fd641c040b9c8c2944894f94efe9
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>
Paul Wisbey [Mon, 23 Mar 2015 15:00:11 +0000 (08:00 -0700)]
Merge "Added metrics logging to TextAtlasRenderer" into new_text
Paul Wisbey [Sun, 22 Mar 2015 13:34:38 +0000 (13:34 +0000)]
Fixed some TCT issues
Change-Id: I933caca09e5b4817216112aa187ccd485c963742
Paul Wisbey [Fri, 20 Mar 2015 14:45:17 +0000 (14:45 +0000)]
Added TextLabel guide
Change-Id: Ia2caf9462b4cd81a60830eb5259da8bdb5f3e20d
Paul Wisbey [Fri, 20 Mar 2015 17:50:37 +0000 (10:50 -0700)]
Merge "Retrieves character's directions." into new_text
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
Paul Wisbey [Fri, 20 Mar 2015 16:59:07 +0000 (09:59 -0700)]
Merge "Layout Engine - Fix for multiline" into new_text
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
Paul Wisbey [Fri, 20 Mar 2015 13:45:06 +0000 (13:45 +0000)]
Removed old programming guide sections
Change-Id: Ie8db0c65ca884a7fb210013b555bc6b520322d69
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>
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>
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>
Paul Wisbey [Thu, 19 Mar 2015 14:22:01 +0000 (14:22 +0000)]
Picked some defaults for dali-demo on Ubuntu
Change-Id: If0162644da55505e4069af65cbf6f5d926f27c30
Adeel Kazmi [Thu, 19 Mar 2015 11:28:15 +0000 (04:28 -0700)]
Merge "DALi Version 1.0.34" into tizen
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
Richard Huang [Thu, 19 Mar 2015 11:04:20 +0000 (11:04 +0000)]
DALi Version 1.0.34
Change-Id: I44af4abb9095fa425fb9d2e809bca16305407842
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
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>
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
Paul Wisbey [Tue, 17 Mar 2015 19:14:26 +0000 (19:14 +0000)]
Basic IMF->KeyEvent and scrolling support
Change-Id: I3477eecc33299231920f7c8be06ae5e7d17e90a6
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>
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
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>
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
Paul Wisbey [Tue, 17 Mar 2015 18:10:28 +0000 (18:10 +0000)]
Added IMF manager hooks
Change-Id: Id873a801a557604e7ff12018a8b4d07b802503da
Paul Wisbey [Tue, 17 Mar 2015 11:04:53 +0000 (11:04 +0000)]
Separate handling of events which modify the Model
Change-Id: Ibe0cac51a33129f446f18faa88e2803d0c3928b5
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>
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
Paul Wisbey [Tue, 17 Mar 2015 09:09:41 +0000 (09:09 +0000)]
Break-up the Relayout method
Change-Id: I55ed27274e9665ea0a1421d804cc021993be009a
Paul Wisbey [Mon, 16 Mar 2015 15:00:22 +0000 (15:00 +0000)]
Added some keyboard & cursor plumbing
Change-Id: Id7db01da8f8476f56873b5f97a5e07e046882fe9
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>
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>
Paul Wisbey [Mon, 16 Mar 2015 13:26:16 +0000 (06:26 -0700)]
Merge "Use Fonts from property system" into new_text
Paul Wisbey [Sun, 15 Mar 2015 14:33:39 +0000 (14:33 +0000)]
Use Fonts from property system
Change-Id: If849096ccfedca212670f05aa5db7dbd6d568fe5
Adeel Kazmi [Mon, 16 Mar 2015 10:10:28 +0000 (03:10 -0700)]
Merge "Updated programming guide for Properties" into tizen
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>
Paul Wisbey [Sun, 15 Mar 2015 13:02:20 +0000 (13:02 +0000)]
Framework for Font styles
Change-Id: Ia99b027f43ab0b2787d15c07dfb7cfd3c4a24473
Adeel Kazmi [Fri, 13 Mar 2015 15:29:41 +0000 (08:29 -0700)]
Merge "Added documentation markdown guide" into tizen
Adeel Kazmi [Fri, 13 Mar 2015 15:23:46 +0000 (08:23 -0700)]
Merge "Removal of LITE profile" into tizen
Nick Holland [Fri, 6 Mar 2015 15:39:50 +0000 (15:39 +0000)]
Added documentation markdown guide
Change-Id: I8cbb65d434b74b60f4cf5c62c8d4865c4d7c97eb
Richard Huang [Fri, 13 Mar 2015 12:01:08 +0000 (12:01 +0000)]
Remove unused ItemView layouts
Change-Id: Ie4087d1f28b6696cad2684bf28e4bc089bed1617
Tom Robinson [Mon, 9 Mar 2015 16:22:51 +0000 (16:22 +0000)]
Updated programming guide for Properties
Change-Id: Ie96b72c4f4f2f22edaca653fe435de1dd937dcbb
taeyoon [Fri, 13 Mar 2015 06:44:32 +0000 (15:44 +0900)]
Removal of LITE profile
Change-Id: I551a4dbd065312c07e9ac5e4356adfae34b4f961
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
Paul Wisbey [Fri, 13 Mar 2015 10:58:56 +0000 (03:58 -0700)]
Merge "TextModel interface" into new_text
taeyoon [Fri, 13 Mar 2015 09:17:51 +0000 (18:17 +0900)]
Change "SLP" to "Tizen"
Change-Id: I7464f5a9ef0b3b2fc7fb6fbbc06c8bfb437e4f62
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>
Paul Wisbey [Thu, 12 Mar 2015 17:07:34 +0000 (17:07 +0000)]
Removed some pointless setters
Change-Id: I278a3a9d4ae30f2d25ee972d6864d586d3482d49
Paul Wisbey [Thu, 12 Mar 2015 16:57:41 +0000 (09:57 -0700)]
Merge "Text Rendering via Atlas Renderer" 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
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>
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>
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>
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>
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>
Paul Wisbey [Tue, 10 Mar 2015 15:08:41 +0000 (15:08 +0000)]
Clipping support for TextField
Change-Id: Idd630cbf9067007c26344a36610a68f8a40a6b06
Nick Holland [Thu, 12 Mar 2015 09:23:16 +0000 (09:23 +0000)]
DALi Version 1.0.33
Change-Id: Ie5fc020fb2b7b9bde369ea4fbc6c263a4f55d998
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>
Paul Wisbey [Wed, 11 Mar 2015 12:53:33 +0000 (12:53 +0000)]
Prefer color Emoji by default
Change-Id: Ic73eb25ce7c9ee2635db9becfe5779111f4a2f83
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>
Paul Wisbey [Wed, 11 Mar 2015 10:51:03 +0000 (10:51 +0000)]
Fixed build break
Change-Id: If273de0d6474c8f955fa7cd28f93ae59ec895e57
Kimmo Hoikka [Tue, 10 Mar 2015 17:33:43 +0000 (17:33 +0000)]
Remove unused FindActorByAlias
Change-Id: I6838d61433ebcf1c84d4d42846ca7abf7a8d5d1c
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>
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
Paul Wisbey [Tue, 10 Mar 2015 13:46:34 +0000 (06:46 -0700)]
Merge "Lines added to the model." into new_text
Paul Wisbey [Tue, 10 Mar 2015 09:26:05 +0000 (09:26 +0000)]
BasicRenderer reworked for RGBA8888
Change-Id: I39ea80c1c862adf8d5b5e715bc97f425c66da386
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>
Paul Wisbey [Tue, 10 Mar 2015 08:25:42 +0000 (08:25 +0000)]
Fixed crash when Visual model positions < glyphs
Change-Id: I61398d876cc3614d97487a5c02c0dd51201f3420
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>
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>
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>
Paul Wisbey [Sun, 8 Mar 2015 16:25:48 +0000 (16:25 +0000)]
Added script value for Emoji
Change-Id: Ieba0efd4ca452dbf9f384af8961b91a745b3e5ac
Paul Wisbey [Sun, 8 Mar 2015 11:40:26 +0000 (11:40 +0000)]
KeyEvent passing mechanism
Change-Id: Ieba701f10bcb3b1e44bcdaf593b8684b8eaa8d03
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
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
Paul Wisbey [Thu, 5 Mar 2015 12:57:05 +0000 (12:57 +0000)]
Property system fixes
Change-Id: I18cb303acbe1e96b60c987336c0aa9ed857a3ea3
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>
Tom Robinson [Mon, 2 Mar 2015 17:11:11 +0000 (17:11 +0000)]
Property refactor in dali-toolkit: Toolkit changes
Change-Id: I1af4c0d2a3983134256ac816cd89df9b138c93f5
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>
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>
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
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
Adeel Kazmi [Thu, 5 Mar 2015 12:55:24 +0000 (04:55 -0800)]
Merge "Add IMPORT_DALI_API to item-layout" into tizen
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
Paul Wisbey [Thu, 5 Mar 2015 09:39:37 +0000 (09:39 +0000)]
TextLabel property fixes
Change-Id: Iaadf7aa6c8dbb3560e790efe0018329b963224d9
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
Paul Wisbey [Thu, 5 Mar 2015 08:06:09 +0000 (08:06 +0000)]
Prepare for Tizen 2.4 API freeze
Change-Id: I109eec1cae19f0cf4c01aa8bfac8a10d54a9750f
daemyung jang [Thu, 5 Mar 2015 00:58:17 +0000 (09:58 +0900)]
Add IMPORT_DALI_API to item-layout
Change-Id: Iefde94b007442649cd9100587d71e8f69f2a0525
Paul Wisbey [Wed, 4 Mar 2015 19:35:12 +0000 (19:35 +0000)]
Only use 1 PanGestureDetector
Change-Id: I6aca21345f52196ac516177b104b75437f3bdb7f
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
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
Adeel Kazmi [Wed, 4 Mar 2015 16:18:46 +0000 (16:18 +0000)]
Updates after TapGestureDetector API Change
Change-Id: Ib4ca3598bde23e804b4a09f6960065c38f5883c3
Paul Wisbey [Wed, 4 Mar 2015 16:34:19 +0000 (16:34 +0000)]
Log which Fonts are selected for each script
Change-Id: I2fd1a055cb37c35895c3da49d503457f55f3457c
Lee Morgan [Wed, 4 Mar 2015 16:11:01 +0000 (16:11 +0000)]
DALi Version 1.0.32
Change-Id: I5007bc6970c0130a9aa5a3b51a86bcc58e077f32
Paul Wisbey [Mon, 2 Mar 2015 18:52:37 +0000 (18:52 +0000)]
Fixed GetHeightForWidth for text label
Change-Id: Ie91ab93ea2fa4fc11589baf867f468c5ceb44082
Paul Wisbey [Wed, 4 Mar 2015 10:34:40 +0000 (02:34 -0800)]
Merge "Text segmentation interface" into new_text
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>
Paul Wisbey [Tue, 3 Mar 2015 18:52:43 +0000 (10:52 -0800)]
Merge "Multi-language support interface" into new_text
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>
projects / platform / core / uifw / dali-toolkit.git / log