Richard Underhill [Wed, 24 Jun 2015 15:54:44 +0000 (16:54 +0100)]
Uses depth within tree to set the depth index of text controls and their renderers.
Change-Id: I83ff441be4bfc558f4357b21b9e32149e8ffb025
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Lee Morgan [Fri, 19 Jun 2015 13:28:50 +0000 (14:28 +0100)]
UTC Builder coverage
Change-Id: I549ff73d9c35075a8d47b85d903dede94284ea5f
Agnelo Vaz [Tue, 23 Jun 2015 14:18:12 +0000 (15:18 +0100)]
Replace Selection when text is entered
Change-Id: Iddf2076234919504e7304b18328c268401cb9115
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Victor Cebollada [Wed, 24 Jun 2015 06:26:15 +0000 (07:26 +0100)]
Fix for Text Selection issues.
- Do not place the left and right selection handles
in the same cursor position.
- Do not recalculate the handles position when the
text stops scrolling.
- Stop the scroll timer when the text stops scrolling.
- Remove the unimplemented methods SetScrollTickInterval()
and GetScrollTickInterval() from the Text::Decorator.
- Do not scroll to the beginning of the text if the
'Select' button is pressed and the cursor is at the end.
Change-Id: I4db3cce902943fb1378f976ae622ad702a0a6790
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Chu Hoang [Wed, 24 Jun 2015 14:54:32 +0000 (15:54 +0100)]
DALi Version 1.0.46
Change-Id: I270f97de01927a6e369ef5271ec028911f9dc243
Richard Underhill [Tue, 23 Jun 2015 12:16:03 +0000 (13:16 +0100)]
Eliminate shader creation per Atlas.
Change-Id: I13f2f215aa841be3b548f34d8172e4ba0e740626
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Richard Underhill [Tue, 23 Jun 2015 10:34:26 +0000 (11:34 +0100)]
Fix for memory leak with BufferImages from FontClient and AtlasManager.
Needs: https://review.tizen.org/gerrit/#/c/42095
Change-Id: I263ac4fede71da91c5f71cbb07a843e6a6fac41a
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Richard Underhill [Wed, 24 Jun 2015 10:52:35 +0000 (11:52 +0100)]
Removed DepthIndex methods from public-api
Needs: https://review.tizen.org/gerrit/#/c/42196/
https://review.tizen.org/gerrit/#/c/42203/
Change-Id: I6420861d1673c81c489d69700123b88ce86cdeed
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Xiangyin Ma [Mon, 22 Jun 2015 17:38:31 +0000 (18:38 +0100)]
TableView: Enum cleanup and Complete the SetCellAlignment() func
Change-Id: Id93a391c9600db277eb62f77e567bdfaddb87757
Francisco Santos [Tue, 23 Jun 2015 13:40:57 +0000 (14:40 +0100)]
Move new mesh API to devel-api.
Change-Id: Ifaf619a6098d6f76c26cfd74eccb6c28eb345e4f
Kimmo Hoikka [Wed, 24 Jun 2015 10:01:52 +0000 (03:01 -0700)]
Merge "Moves shader creation from Text Atlas Renderer to GlyphManager" into devel/new_mesh
Adeel Kazmi [Tue, 23 Jun 2015 15:52:13 +0000 (08:52 -0700)]
Merge "Remove last character when pre-edit text is empty" into devel/master
Adeel Kazmi [Tue, 23 Jun 2015 15:49:57 +0000 (08:49 -0700)]
Merge "Sanitize code inside Alignment, remove duplication and unnecessary functor creation" into devel/master
Paul Wisbey [Tue, 23 Jun 2015 13:45:06 +0000 (14:45 +0100)]
Remove last character when pre-edit text is empty
Change-Id: I51565112dbddc2928d77fe41655f25d81ec9a514
Richard Underhill [Wed, 17 Jun 2015 14:07:49 +0000 (15:07 +0100)]
Moves shader creation from Text Atlas Renderer to GlyphManager
Change-Id: Id0897b32ef799bf27fe1d3f16927f5d49933d4bb
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Tue, 23 Jun 2015 14:03:35 +0000 (07:03 -0700)]
Merge "TET cases for Text." into devel/master
Victor Cebollada [Mon, 22 Jun 2015 16:07:21 +0000 (17:07 +0100)]
TET cases for Text.
Test the status of the text-field actors after sending some events.
Removes some unused code.
Change-Id: I5ded4718bc9a1969c43b6b1e91689524561c2588
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Agnelo Vaz [Tue, 23 Jun 2015 12:55:49 +0000 (13:55 +0100)]
TextController Paste button functional
Change-Id: Ic62265c2e17551374e9774829e5f491ca21cf807
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Paul Wisbey [Tue, 23 Jun 2015 09:01:30 +0000 (02:01 -0700)]
Merge "Improve Selection handle hit region so not above the handle" into devel/master
Nick Holland [Tue, 23 Jun 2015 07:36:46 +0000 (08:36 +0100)]
Script UTC test cases
Change-Id: I225ed158c15d6bd3f620e78266a5e8b99c8495c2
Adeel Kazmi [Mon, 22 Jun 2015 17:22:03 +0000 (10:22 -0700)]
Merge "UTC added for Text, Multi-language." into devel/master
Agnelo Vaz [Mon, 22 Jun 2015 17:08:18 +0000 (18:08 +0100)]
Improve Selection handle hit region so not above the handle
Change-Id: Ica85dc9e144ec2ebd4c4bb70818054781ae4cfad
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Paul Wisbey [Mon, 22 Jun 2015 17:08:13 +0000 (10:08 -0700)]
Merge "TextContoller Copy and Cut buttons functional" into devel/master
Kimmo Hoikka [Mon, 22 Jun 2015 17:06:48 +0000 (18:06 +0100)]
Sanitize code inside Alignment, remove duplication and unnecessary functor creation
Change-Id: Iff757042cb4d7c67e1a39d2ca6ed3a582e46ab5a
Richard Huang [Fri, 12 Jun 2015 15:48:12 +0000 (16:48 +0100)]
Add support for new accessibility actions
1. Rename AccessibilityFocusManager to AccessibilityManager
2. Added support for new accessibility actions
Change-Id: If39a4a242c0fe80a3e6fe9a69dfff827d0554aab
Agnelo Vaz [Fri, 19 Jun 2015 15:39:55 +0000 (16:39 +0100)]
TextContoller Copy and Cut buttons functional
Change-Id: I5a0d810048156e32f829fa05617fd2d25ac2ac40
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Victor Cebollada [Mon, 22 Jun 2015 14:06:54 +0000 (15:06 +0100)]
Text TET cases for TextField and TextLabel controls.
Change-Id: I486d7f80f95cca700c173f3f006bd597d7c28f5b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 22 Jun 2015 07:46:38 +0000 (08:46 +0100)]
Text logical and visual models. Remove unused/unwanted code.
Change-Id: Iee86400a173278fbeed48783b019b2d359c845fe
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Fri, 19 Jun 2015 16:41:03 +0000 (17:41 +0100)]
Fix for resizing TextField when Delete button is added
Change-Id: Icc9eeb9414f1b6ca32a5870c045f1850b3dea8a8
Victor Cebollada [Fri, 19 Jun 2015 14:04:43 +0000 (15:04 +0100)]
TextSelectionPopup : Select, Select All implemented.
Change-Id: If7b0bdf92318edb695e0ea20186d47336e702833
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Agnelo Vaz [Mon, 15 Jun 2015 15:55:53 +0000 (16:55 +0100)]
Text Selection Toolbar scrolling
Change-Id: I490f640f66c43ed98f8005e2e87f891cd77ceb90
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Kimmo Hoikka [Fri, 19 Jun 2015 16:01:09 +0000 (09:01 -0700)]
Merge "(Magnifier) Properties added, APIs removed, Tests added" into devel/master
Paul Wisbey [Fri, 19 Jun 2015 15:33:35 +0000 (08:33 -0700)]
Merge "TextSelectionPopup to show Paste in data in Clipboard" into devel/master
Agnelo Vaz [Fri, 19 Jun 2015 10:28:24 +0000 (11:28 +0100)]
TextSelectionPopup to show Paste in data in Clipboard
Requires Adaptor fix "Fix Clipboard to return 0 when has no items"
Change-Id: I37213b3cc024d434d164136c509c2c9d6c7d0ccb
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Fri, 19 Jun 2015 13:57:36 +0000 (14:57 +0100)]
(Magnifier) Properties added, APIs removed, Tests added
Change-Id: If66553b3abc998209ea0c10b7d9292bf9a2c32e9
Victor Cebollada [Thu, 18 Jun 2015 15:42:04 +0000 (16:42 +0100)]
text popup callbacks.
Change-Id: I2357b7cfdd2983dcdc021aad0dbb9645cd74f328
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Agnelo Vaz [Thu, 18 Jun 2015 13:28:48 +0000 (14:28 +0100)]
TextSelectionPopup follows Handles and button change with state and other improvements
Pixel align positioning of Popup and padding
Show Copy and Cut when in Selecting State
Change-Id: I5e8a02fae89cf096f3e6319eb8f500aaf0ea6741
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Richard Underhill [Thu, 18 Jun 2015 14:11:22 +0000 (15:11 +0100)]
Removed DrawMode::OVERLAY from Toolkit components.
Change-Id: I727cc5b486d7cea5cb4d9970c4d5447dbffb46f3
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Victor Cebollada [Thu, 18 Jun 2015 10:13:23 +0000 (11:13 +0100)]
Fixes for text selection.
-Selection handles pressed images added.
-Do not flip the images in the Relayout() method.
-Fix a crash when both handles are at the first glyph.
Change-Id: Ide420f902df1b3c2878a825f5e7bd037f1c7b866
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Thu, 18 Jun 2015 14:02:24 +0000 (07:02 -0700)]
Merge "TextSelectionPopup buttons can be enabled from TextController" into devel/master
Adeel Kazmi [Thu, 18 Jun 2015 11:18:32 +0000 (04:18 -0700)]
Merge "DALi Version 1.0.45" into devel/master
Xiangyin Ma [Thu, 18 Jun 2015 11:14:22 +0000 (12:14 +0100)]
DALi Version 1.0.45
Change-Id: I985cc3172ee24515b9257f883dcaf18d4c9196cc
Agnelo Vaz [Mon, 15 Jun 2015 15:57:16 +0000 (16:57 +0100)]
TextSelectionPopup buttons can be enabled from TextController
Change-Id: I2940fe925a12864b0471a1340803766cca76fc27
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Paul Wisbey [Wed, 10 Jun 2015 14:24:11 +0000 (15:24 +0100)]
Selection implementation.
Change-Id: I06668e73f1cf1fba9c2dbf100b23a3668511fae0
Heeyong Song [Wed, 17 Jun 2015 07:08:15 +0000 (16:08 +0900)]
Fix prevent issues
1. builder-set-property.cpp: Unsigned compared against 0 (NO_EFFECT)
3. text-selection-popup-impl.cpp: Integer overflowed argument (if numberOfOptions == 0)
4. text-controller-impl.cpp: Overflowed return value (if lineIndex == 0)
5. text-controller.cpp: Unsigned compared against 0 (NO_EFFECT)
6. solid-color-actor.cpp: Dereference null return value (pixbuf)
Change-Id: I1b4d4c1a69dec7df300bdbb88fb503cbe336497a
Paul Wisbey [Wed, 17 Jun 2015 11:08:36 +0000 (04:08 -0700)]
Merge "TextSelectionToolbar and Style Properties added" into devel/master
Adeel Kazmi [Wed, 17 Jun 2015 11:02:24 +0000 (04:02 -0700)]
Merge "Updates required for https://review.tizen.org/gerrit/#/c/41602/" into devel/master
Agnelo Vaz [Tue, 9 Jun 2015 13:13:34 +0000 (14:13 +0100)]
TextSelectionToolbar and Style Properties added
Change-Id: Ie6f58e42eaba78e659ad589572ab6ce5028732b2
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Wed, 17 Jun 2015 09:35:29 +0000 (02:35 -0700)]
Merge "Fixed deletion of last character with no place-holder text" into devel/master
Paul Wisbey [Tue, 16 Jun 2015 17:28:18 +0000 (18:28 +0100)]
Fixed deletion of last character with no place-holder text
Change-Id: I3974b9118b990615b4b90874a1f8257de1f7cc36
Richard Huang [Tue, 16 Jun 2015 14:20:57 +0000 (15:20 +0100)]
Emit a signal when layout is activated in ItemView
Change-Id: If10b9c5c7c4b278f0400ee51fca72af4d06dea5f
Kimmo Hoikka [Tue, 16 Jun 2015 14:30:50 +0000 (15:30 +0100)]
Updates required for https://review.tizen.org/gerrit/#/c/41602/
Change-Id: Id188e5221ac0d54516fbe9c2730a9b0529acd923
Kimmo Hoikka [Tue, 16 Jun 2015 13:52:37 +0000 (06:52 -0700)]
Merge "Fixes Drop Shadow Frustum Culling." into devel/new_mesh
Ferran Sole [Mon, 15 Jun 2015 09:44:57 +0000 (10:44 +0100)]
Fix for Control::GetNaturalSize()
Control will now return background image size if there is one or
Vector3::ZERO otherwise.
Change-Id: I8480964ffbe2049e53ccf8ebb0103cceeb9caa49
Kimmo Hoikka [Fri, 12 Jun 2015 19:12:00 +0000 (20:12 +0100)]
Remove dali-any from Property::Value
- reimplement multivalue using more efficient union inside value
- remove unnecessary asserts when types dont match
- cleanup and sanitize scripting
- remove unnecessary templates from GetEnum, added error handling
Change-Id: I6fce541ca017feab5f569e64d9d98c3427926245
Richard Underhill [Fri, 12 Jun 2015 14:01:37 +0000 (15:01 +0100)]
Fixes Drop Shadow Frustum Culling.
Change-Id: I2161e86b8d8375185af8f59ef7a1915231238bc5
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Thu, 11 Jun 2015 16:30:38 +0000 (17:30 +0100)]
(Control) Ensure GetImplementation functions are exported
Change-Id: I496a3be0c92073d1733116927f2ff1f45f07c723
Adeel Kazmi [Thu, 11 Jun 2015 15:21:04 +0000 (16:21 +0100)]
Added tests for EffectsView
Change-Id: Ie9af9cfaa4906cf3bb5b7b85fefe6f6a6750536f
Kimmo Hoikka [Thu, 11 Jun 2015 16:28:08 +0000 (09:28 -0700)]
Merge "Move tts-player.h from devel-api to public-api" into devel/master
Victor Cebollada [Wed, 13 May 2015 08:33:01 +0000 (09:33 +0100)]
UTC added for Text, Multi-language.
Change-Id: I591e8b9d8aa00c13defea582f30ae4d0f5df63ca
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Thu, 11 Jun 2015 16:15:57 +0000 (09:15 -0700)]
Merge changes Icccc1ca3,Ia32ce8ab into devel/master
* changes:
UTC added for Text, Segmentation.
UTC added for Text, CharacterSetConversion.
Victor Cebollada [Wed, 6 May 2015 08:08:06 +0000 (09:08 +0100)]
UTC added for Text, Segmentation.
Change-Id: Icccc1ca3d0f2426622a0f81ca93f07884af25582
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Wed, 6 May 2015 06:31:20 +0000 (07:31 +0100)]
UTC added for Text, CharacterSetConversion.
Change-Id: Ia32ce8ab447035517f93156bdea5c3a3a6f556e7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Thu, 11 Jun 2015 15:14:21 +0000 (08:14 -0700)]
Merge "UTC Increase builder line coverage" into devel/master
Paul Wisbey [Thu, 11 Jun 2015 14:58:33 +0000 (07:58 -0700)]
Merge "Fix the text scroll when deleting text." into devel/master
Paul Wisbey [Thu, 11 Jun 2015 14:57:38 +0000 (07:57 -0700)]
Merge "Fixes for text layout." into devel/master
Paul Wisbey [Thu, 11 Jun 2015 14:51:52 +0000 (07:51 -0700)]
Merge "Add the alignment offset to the glyph lines." into devel/master
Lee Morgan [Thu, 11 Jun 2015 09:43:42 +0000 (10:43 +0100)]
UTC Increase builder line coverage
Change-Id: I6db8d02c8a6b4d6e16f30217774064eef0cbbd37
Adeel Kazmi [Thu, 11 Jun 2015 10:19:42 +0000 (03:19 -0700)]
Merge "DALi Version 1.0.44" into devel/master
Victor Cebollada [Wed, 10 Jun 2015 15:14:28 +0000 (16:14 +0100)]
Fix the text scroll when deleting text.
Change-Id: I0c5b5983686402412c136ed913f09e73c0cd350b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 19 May 2015 08:25:45 +0000 (09:25 +0100)]
Fixes for text layout.
Give some space to place the cursor.
Change-Id: I7c244731896a919c48f781e1efa6e9b6e44f3e6b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 9 Jun 2015 08:47:25 +0000 (09:47 +0100)]
Add the alignment offset to the glyph lines.
When the lines are horizontally aligned, we don't
want to modify the original layout. Subsequent calls
to Layout::Align() will always use the original layout
and modify only the alignment offset of each line.
The TextView is the responsible of adding the offset
to get the final layout.
Change-Id: Id8c1fea9a75e77b597b6744f226ef566408e6e8c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Tom Robinson [Thu, 11 Jun 2015 09:46:12 +0000 (10:46 +0100)]
DALi Version 1.0.44
Change-Id: Ie5fed15d1b44ccc4c504607d42b8341ed557ebc5
Victor Cebollada [Thu, 11 Jun 2015 07:00:46 +0000 (08:00 +0100)]
Fix for multi-language support.
Change-Id: I0eb938a4edac325daff30cad3a77f5bd1e80f5ac
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Wed, 10 Jun 2015 15:10:56 +0000 (16:10 +0100)]
Increased Line/Function Coverage for BloomView & TableView
Change-Id: I440954500f6e338728e85ac01aa95d1b65a630cc
Francisco Santos [Tue, 9 Jun 2015 17:55:11 +0000 (18:55 +0100)]
Remove uniform mapping.
Change-Id: If347a572c3bb51192234317831509f1ada66e595
Kimmo Hoikka [Wed, 10 Jun 2015 16:39:11 +0000 (09:39 -0700)]
Merge "Dont register accessibility and keyboard focus properties as scene graph properties" into devel/master
Richard Huang [Wed, 10 Jun 2015 16:30:39 +0000 (17:30 +0100)]
Move tts-player.h from devel-api to public-api
Change-Id: I0853e2be097fe530a692857d196f4bf60dc3b29f
Victor Cebollada [Wed, 10 Jun 2015 08:42:39 +0000 (09:42 +0100)]
Fix for Text::Controller::SetText().
If the controller is in edit mode it updates
the cursor and scroll positions.
Change-Id: Ibff1eeed819e6b348002521c0ad6745649544e7e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Wed, 10 Jun 2015 12:36:09 +0000 (13:36 +0100)]
Dont register accessibility and keyboard focus properties as scene graph properties
Change-Id: I8a978218db2e7fad39e9065bad8c63f0a01b5e63
Richard Underhill [Wed, 10 Jun 2015 09:07:36 +0000 (10:07 +0100)]
Improved reference caching in AtlasGlyphManager for text changes in an existing Text control
Change-Id: Ib56edfedee5fe9a8f71df8643116c20b19f95465
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Andrew Cox [Tue, 9 Jun 2015 13:45:58 +0000 (14:45 +0100)]
Fixup for core removal of GeometryType and ShaderSubTypes
Fixes for this patch: https://review.tizen.org/gerrit/#/c/40425/3
Change-Id: Ibb585bb895ce6f426c2ecbfa9bf749ab136ed8f4
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Tue, 9 Jun 2015 11:32:51 +0000 (12:32 +0100)]
Ported control backgrounds to use new mesh API
Change-Id: I10423d8e2c6b70c9a7e801804e2ac55809f8e3f7
Ferran Sole [Wed, 3 Jun 2015 13:56:51 +0000 (14:56 +0100)]
OnStageConnection changes
Changed OnStageConnection in core so it now receives via a parameter the depth
at which the actor has been connected in the hierarchy
Change-Id: I75369875dec87ae0fe4196e9f1653d902e1bc4bc
Adeel Kazmi [Tue, 9 Jun 2015 10:25:08 +0000 (03:25 -0700)]
Merge "Fixed missing includes in shader test cases." into devel/new_mesh
Victor Cebollada [Tue, 9 Jun 2015 10:01:22 +0000 (11:01 +0100)]
Fix for text ellipsis.
The FontClient::GetPointSize() logs an error and
returns the default font point size if the font id
is zero.
Some glyphs i.e. the '\n' have font id zero. It
avoids the call to that method with font id
equal to zero.
Change-Id: Ie4877d4ec87b1dfd65dd98bc405b8768e4e2a57e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 9 Jun 2015 09:50:57 +0000 (02:50 -0700)]
Merge "Merge branch 'tizen' into devel/new_mesh" into devel/new_mesh
Paul Wisbey [Mon, 8 Jun 2015 18:10:39 +0000 (11:10 -0700)]
Merge "Control to call Init derived classes before applying style" into devel/master
Agnelo Vaz [Mon, 8 Jun 2015 16:40:54 +0000 (17:40 +0100)]
Control to call Init derived classes before applying style
Change-Id: Ib485ee1b53906a279f8e53797a492ddaf2552c94
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Francisco Santos [Mon, 8 Jun 2015 16:36:00 +0000 (17:36 +0100)]
Fixed missing includes in shader test cases.
Change-Id: Ib5d11ee5085f3f69b068c8f0f62d5b38c0053cfa
Paul Wisbey [Mon, 8 Jun 2015 10:31:16 +0000 (11:31 +0100)]
Remove reference to Control from Decorator
Change-Id: Ic42235709236938e5895589ae469cf57fddad9e0
Francisco Santos [Mon, 8 Jun 2015 09:56:13 +0000 (10:56 +0100)]
Merge branch 'tizen' into devel/new_mesh
Conflicts:
automated-tests/src/dali-toolkit/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/dali-toolkit.h
dali-toolkit/devel-api/shader-effects/alpha-discard-effect.cpp
dali-toolkit/devel-api/shader-effects/bendy-effect.cpp
dali-toolkit/devel-api/shader-effects/blind-effect.cpp
dali-toolkit/devel-api/shader-effects/bouncing-effect.cpp
dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.cpp
dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.h
dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.cpp
dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h
dali-toolkit/devel-api/shader-effects/carousel-effect.cpp
dali-toolkit/devel-api/shader-effects/displacement-effect.cpp
dali-toolkit/devel-api/shader-effects/dissolve-effect.cpp
dali-toolkit/devel-api/shader-effects/dissolve-local-effect.cpp
dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp
dali-toolkit/devel-api/shader-effects/image-region-effect.cpp
dali-toolkit/devel-api/shader-effects/iris-effect.cpp
dali-toolkit/devel-api/shader-effects/mask-effect.cpp
dali-toolkit/devel-api/shader-effects/mirror-effect.cpp
dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp
dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp
dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.cpp
dali-toolkit/devel-api/shader-effects/overlay-effect.cpp
dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.cpp
dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.h
dali-toolkit/devel-api/shader-effects/page-turn-effect.cpp
dali-toolkit/devel-api/shader-effects/page-turn-effect.h
dali-toolkit/devel-api/shader-effects/quadratic-bezier.cpp
dali-toolkit/devel-api/shader-effects/ripple-effect.cpp
dali-toolkit/devel-api/shader-effects/ripple2d-effect.cpp
dali-toolkit/devel-api/shader-effects/shear-effect.cpp
dali-toolkit/devel-api/shader-effects/soft-button-effect.cpp
dali-toolkit/devel-api/shader-effects/spot-effect.cpp
dali-toolkit/devel-api/shader-effects/square-dissolve-effect.cpp
dali-toolkit/devel-api/shader-effects/swirl-effect.cpp
dali-toolkit/devel-api/shader-effects/water-effect.cpp
dali-toolkit/devel-api/shader-effects/water-effect.h
dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
dali-toolkit/internal/controls/buttons/check-box-button-impl.h
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
dali-toolkit/internal/shader-effects/water-effect-impl.cpp
dali-toolkit/internal/shader-effects/water-effect-impl.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/file.list
dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
docs/content/programming-guide/shader-intro.h
Change-Id: I677eaa3e6a0558c360fc6b379a73fac18d0eb008
Andrew Cox [Fri, 5 Jun 2015 18:43:42 +0000 (19:43 +0100)]
Fix build broken by commit
a935f3ab6c983de3ac7e37e63a9a3905e0e9009f
* Brokeness only showed up with a true clean build.
* I stepped forward through commits and the file in question disappeared
at commit id shown above.
Change-Id: Ic3df17a9e40d1f44286d4cb42644edeab5589300
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Adeel Kazmi [Thu, 4 Jun 2015 15:12:50 +0000 (08:12 -0700)]
Merge "Text Drop Shadow sorting fix" into devel/new_mesh
Adeel Kazmi [Thu, 4 Jun 2015 15:12:01 +0000 (08:12 -0700)]
Merge "Fixes building of automated tests" into devel/new_mesh
Adeel Kazmi [Thu, 4 Jun 2015 15:08:31 +0000 (08:08 -0700)]
Merge "Added TextChanged signal to TextField" into tizen
Paul Wisbey [Thu, 4 Jun 2015 10:57:59 +0000 (11:57 +0100)]
Added TextChanged signal to TextField
Change-Id: I7e0560b289d321db65d3a71de273b407c2f1f0f5
Kimmo Hoikka [Thu, 4 Jun 2015 10:45:08 +0000 (03:45 -0700)]
Merge "DALi Version 1.0.43" into tizen
Richard Huang [Thu, 4 Jun 2015 10:06:10 +0000 (11:06 +0100)]
DALi Version 1.0.43
Change-Id: Id0280d1fa846e4e069bd5a6941c0b415fa5ac759
Adeel Kazmi [Wed, 3 Jun 2015 20:05:41 +0000 (21:05 +0100)]
(Programming Guide) ItemView
Change-Id: If9480c78a19bf9b5f47e56f1dba8d77eac373781