platform/core/uifw/dali-toolkit.git
9 years agoMoved PushButton::SetButtonImage etc to Button base class. 07/43607/5
Chu Hoang [Fri, 10 Jul 2015 16:48:13 +0000 (17:48 +0100)]
Moved PushButton::SetButtonImage etc to Button base class.

Change-Id: I2eb20df5c00597c129ea0688ec3a4a11e42b77e6

9 years agoApply default theme if no THEME_CHANGE occurs 84/43584/8
Paul Wisbey [Fri, 10 Jul 2015 09:46:38 +0000 (10:46 +0100)]
Apply default theme if no THEME_CHANGE occurs

Change-Id: I46d061d3ba3d289aac94d596da64a9a381136d45

9 years agoMerge "Automated test fix for framebuffer creation" into devel/master
Kimmo Hoikka [Fri, 10 Jul 2015 14:47:29 +0000 (07:47 -0700)]
Merge "Automated test fix for framebuffer creation" into devel/master

9 years agoMerge "Remove de-funct dynamics support" into devel/master
Adeel Kazmi [Fri, 10 Jul 2015 13:20:21 +0000 (06:20 -0700)]
Merge "Remove de-funct dynamics support" into devel/master

9 years agoAutomated test fix for framebuffer creation 77/43077/2
David Fumanal [Tue, 7 Jul 2015 13:10:49 +0000 (14:10 +0100)]
Automated test fix for framebuffer creation

Change-Id: I775dbaedaabc18f1cc678e820df590b4493a0cc3

9 years agoMerge "Fixed crash while wrapping a Control as an actor in JavaScript plugin" into...
Adeel Kazmi [Fri, 10 Jul 2015 09:52:36 +0000 (02:52 -0700)]
Merge "Fixed crash while wrapping a Control as an actor in JavaScript plugin" into devel/master

9 years agoRemove de-funct dynamics support 11/43511/1
Kimmo Hoikka [Thu, 9 Jul 2015 18:54:34 +0000 (19:54 +0100)]
Remove de-funct dynamics support

Change-Id: I6f38ba989f55e75a7397a25d2c0e40a49fc9d9e1

9 years agoRemove unnecessarily checked in binaries 08/43508/1
Kimmo Hoikka [Thu, 9 Jul 2015 12:17:47 +0000 (13:17 +0100)]
Remove unnecessarily checked in binaries

Change-Id: Idb28aaa7455291f0f66bc225f307f5a0b608519c

9 years agoMerge "replaced toolkit pushbutton images with shorter images." into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 16:13:09 +0000 (09:13 -0700)]
Merge "replaced toolkit pushbutton images with shorter images." into devel/master

9 years agoMerge "DALi Version 1.0.48" into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 16:11:40 +0000 (09:11 -0700)]
Merge "DALi Version 1.0.48" into devel/master

9 years agoMerge "Remove UNSIGNED_INTEGER property type (removed from core)" into devel/master
Paul Wisbey [Thu, 9 Jul 2015 14:40:34 +0000 (07:40 -0700)]
Merge "Remove UNSIGNED_INTEGER property type (removed from core)" into devel/master

9 years agoDALi Version 1.0.48 93/43493/1 dali_1.0.48
Lee Morgan [Thu, 9 Jul 2015 14:02:32 +0000 (15:02 +0100)]
DALi Version 1.0.48

Change-Id: I13b15982ea4b7bd4d9751e351618727d691b4c0d

9 years agoFixed crash while wrapping a Control as an actor in JavaScript plugin 89/43489/2
Richard Huang [Thu, 9 Jul 2015 13:38:13 +0000 (14:38 +0100)]
Fixed crash while wrapping a Control as an actor in JavaScript plugin

Change-Id: I4c01b5a77836ffd9b22bf3c1b2aa2f809871f1c5

9 years agoMerge "Fix for the layout engine." into devel/master
Paul Wisbey [Thu, 9 Jul 2015 12:22:14 +0000 (05:22 -0700)]
Merge "Fix for the layout engine." into devel/master

9 years agoRemove UNSIGNED_INTEGER property type (removed from core) 85/43385/3
Kimmo Hoikka [Wed, 8 Jul 2015 14:40:03 +0000 (15:40 +0100)]
Remove UNSIGNED_INTEGER property type (removed from core)

Change-Id: I9874eeaeb95b59e4486265951184558e48efc72f

9 years agoMerge "Fixed signals for toggle button" into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 10:39:55 +0000 (03:39 -0700)]
Merge "Fixed signals for toggle button" into devel/master

9 years agoFix for the layout engine. 44/43444/1
Victor Cebollada [Thu, 9 Jul 2015 09:35:07 +0000 (10:35 +0100)]
Fix for the layout engine.

* It was not updating the line height for the last character.

Change-Id: Ica8b0c2c3870bb24ebbdc2e3197c3ee551b80876
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "TextSelection Popup Styling Image update and json" into devel/master
Paul Wisbey [Wed, 8 Jul 2015 18:04:50 +0000 (11:04 -0700)]
Merge "TextSelection Popup Styling Image update and json" into devel/master

9 years agoTextSelection Popup Styling Image update and json 99/42999/13
Agnelo Vaz [Mon, 6 Jul 2015 16:00:00 +0000 (17:00 +0100)]
TextSelection Popup Styling Image update and json

Change-Id: I75fa29003e4f77aa7b81294ea6205fb5ad7ad7ef
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoConfigure which platform style to use 88/43088/10
Agnelo Vaz [Tue, 7 Jul 2015 16:10:16 +0000 (17:10 +0100)]
Configure which platform style to use

Change-Id: I5c558f08ecfd63aff34da334f8a60b28309eefa2
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFixed signals for toggle button 88/43388/1
Tom Robinson [Wed, 8 Jul 2015 16:33:18 +0000 (17:33 +0100)]
Fixed signals for toggle button

Change-Id: I178600d47f4564207fb6b6c3a21b38ad43d37b3b

9 years agoMissing comma from stylesheet 83/43383/1
Kimmo Hoikka [Wed, 8 Jul 2015 13:53:43 +0000 (14:53 +0100)]
Missing comma from stylesheet

Change-Id: Ia0e262aff7cca09705c1e4e6e3d5cc233a090d71

9 years agoreplaced toolkit pushbutton images with shorter images. 63/43363/1
Chu Hoang [Wed, 8 Jul 2015 10:35:31 +0000 (11:35 +0100)]
replaced toolkit pushbutton images with shorter images.

This fixes issue for when the pushbutton was shorter than the original pushbutton images the top and bottom of the 9 patch would overlap. The overlap was then visible when the button was transitioning.

Change-Id: I6f1056fa8f9e32ca8de7adee3e20228ad33178dc

9 years agoMerge "Fix when typing text and the grab handle is visible/pressed." into devel/master
Paul Wisbey [Tue, 7 Jul 2015 15:49:49 +0000 (08:49 -0700)]
Merge "Fix when typing text and the grab handle is visible/pressed." into devel/master

9 years agoMerge "Fix for TextField clipping." into devel/master
Paul Wisbey [Tue, 7 Jul 2015 14:53:54 +0000 (07:53 -0700)]
Merge "Fix for TextField clipping." into devel/master

9 years agoFix for TextField clipping. 80/43080/2
Victor Cebollada [Tue, 7 Jul 2015 13:36:29 +0000 (14:36 +0100)]
Fix for TextField clipping.

* The text clipper is created after the text is rendered
  for the first time. If a text is long enough it exceeds
  the boundaries of the text-field in the first render.

Change-Id: I1c6191fcfb7dce2935cec774fe877c89842555bd
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Node JS Addon for DALi + Improvements" into devel/master
Adeel Kazmi [Tue, 7 Jul 2015 14:14:22 +0000 (07:14 -0700)]
Merge "Node JS Addon for DALi + Improvements" into devel/master

9 years agoFix when typing text and the grab handle is visible/pressed. 73/43073/2
Victor Cebollada [Tue, 7 Jul 2015 10:48:36 +0000 (11:48 +0100)]
Fix when typing text and the grab handle is visible/pressed.

* Adds a new state EDITING_WITH_GRAB_HANDLE.

Change-Id: Ibb3294ce9de9ea701e1906c116a635b54d702f98
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Fix Klocwork issues." into devel/master
Adeel Kazmi [Tue, 7 Jul 2015 09:32:52 +0000 (02:32 -0700)]
Merge "Fix Klocwork issues." into devel/master

9 years agoNode JS Addon for DALi + Improvements 91/42391/4
Nick Holland [Fri, 26 Jun 2015 14:51:24 +0000 (15:51 +0100)]
Node JS Addon for DALi + Improvements

old: control = new dali.TextField();
new: control = new dali.Control('control-name');

old: log('my message \n');
new: console.log('my message'); // common.js style
new: console.error('my error message')

// added ability to require('dali')
If we are running JavaScript in Node.JS it has to explicity
call require('dali'); This is now supported in dali standalone as well
to maintain code compatibility.

Change-Id: I8f5f1828bb3e5df950f4fedf952013eb247906e5

9 years agoMerge "(AutomatedTests) Synchronise TestSingletonService with Adaptor" into devel...
Kimmo Hoikka [Tue, 7 Jul 2015 09:23:17 +0000 (02:23 -0700)]
Merge "(AutomatedTests) Synchronise TestSingletonService with Adaptor" into devel/master

9 years agoMerge "Fixed Text Quality Regression" into devel/master
Paul Wisbey [Tue, 7 Jul 2015 08:27:18 +0000 (01:27 -0700)]
Merge "Fixed Text Quality Regression" into devel/master

9 years agoFixed Text Quality Regression 87/42887/6
Richard Underhill [Fri, 3 Jul 2015 13:26:34 +0000 (14:26 +0100)]
Fixed Text Quality Regression

Positioning of multiple 'mesh' actors per text-label was incorrect
i.e. caused by SetSize(1,1) on parent actors.

Compensated for sampling errors by rendering half a texel more on each edge.

Change-Id: Iaee82914ca736867be081779badb8c6476a8b95d
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Stop doing unparent and reset in text decorator." into devel/master
Paul Wisbey [Mon, 6 Jul 2015 15:45:47 +0000 (08:45 -0700)]
Merge "Stop doing unparent and reset in text decorator." into devel/master

9 years ago(AutomatedTests) Synchronise TestSingletonService with Adaptor 90/42990/3
Adeel Kazmi [Mon, 6 Jul 2015 13:52:23 +0000 (14:52 +0100)]
(AutomatedTests) Synchronise TestSingletonService with Adaptor

Change-Id: Ie534cf1d54b58e1aaa62464e18f4a30f40b29313

9 years agoMerge "Only use StyleManager if it really is available" into devel/master
Adeel Kazmi [Mon, 6 Jul 2015 14:56:10 +0000 (07:56 -0700)]
Merge "Only use StyleManager if it really is available" into devel/master

9 years agoMerge "Fix for cursor position when there is no text and no place holder text." into...
Paul Wisbey [Mon, 6 Jul 2015 14:53:26 +0000 (07:53 -0700)]
Merge "Fix for cursor position when there is no text and no place holder text." into devel/master

9 years agoStop doing unparent and reset in text decorator. 73/42873/11
Victor Cebollada [Tue, 30 Jun 2015 10:22:04 +0000 (11:22 +0100)]
Stop doing unparent and reset in text decorator.

  * Fixes the text's popup performance issue.
  * Lays out the highlight text behind the text.
  * Fixes the highlight color.

Change-Id: I65a1d5509117f33b6e77bcb2fa2517bb1cd42ff3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoOnly use StyleManager if it really is available 75/42975/1
Kimmo Hoikka [Mon, 6 Jul 2015 12:46:25 +0000 (13:46 +0100)]
Only use StyleManager if it really is available

Change-Id: I90fdf261f7e93faeaa3fa14daa021169f98467c6

9 years agoFix Klocwork issues. 61/42961/3
Victor Cebollada [Tue, 23 Jun 2015 14:37:52 +0000 (15:37 +0100)]
Fix Klocwork issues.

Change-Id: I36d4d1df2d384410e26b7d8c588389d2da20765f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoFix for cursor position when there is no text and no place holder text. 56/42956/1
Victor Cebollada [Mon, 6 Jul 2015 08:46:11 +0000 (09:46 +0100)]
Fix for cursor position when there is no text and no place holder text.

* When there are no characters, the line height of the default
  font is used to align the text.

Change-Id: I3f7506bac0fe4afd6ccd3fb88e80e449d1e73af7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoTextField Styling upgrade, Builder to use filenames 04/42904/1
Agnelo Vaz [Fri, 3 Jul 2015 15:59:25 +0000 (16:59 +0100)]
TextField Styling upgrade, Builder to use filenames

Change-Id: Iaa66bbf675e988ecf2a5f757de07f2a33c14f31d
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoHarmonize test failures 72/42872/1
Adeel Kazmi [Fri, 3 Jul 2015 09:51:53 +0000 (10:51 +0100)]
Harmonize test failures

Change-Id: I69142b8addadc415c7428594f73a146d41737777

9 years agoMerge "Accessibility Manager public API UTC tests and coverage" into devel/master
Adeel Kazmi [Fri, 3 Jul 2015 08:26:35 +0000 (01:26 -0700)]
Merge "Accessibility Manager public API UTC tests and coverage" into devel/master

9 years agoTextField, Prevent Home key deleting selected text 24/42824/2
Agnelo Vaz [Thu, 2 Jul 2015 16:34:09 +0000 (17:34 +0100)]
TextField, Prevent Home key deleting selected text

Change-Id: Ib56946551ab11b891e90bd8926eb81b074c93706
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoAccessibility Manager public API UTC tests and coverage 25/42825/1
Tom Robinson [Thu, 2 Jul 2015 17:06:42 +0000 (18:06 +0100)]
Accessibility Manager public API UTC tests and coverage

Change-Id: I861347f17d5c27f284c56fc509734ed33f6c2dd9

9 years agoTextField, Add INTERRUPTED state for h/w buttons 22/42822/4
Agnelo Vaz [Thu, 2 Jul 2015 14:08:12 +0000 (15:08 +0100)]
TextField, Add INTERRUPTED state for h/w buttons

Change-Id: Id1db8cd3155a36e3d60b848c2c37afe6935bbc16
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "Added GetReadPosition to AccessibilityManager API" into devel/master
Adeel Kazmi [Thu, 2 Jul 2015 16:00:34 +0000 (09:00 -0700)]
Merge "Added GetReadPosition to AccessibilityManager API" into devel/master

9 years agoMerge "Bug fix when creating background of control using ImageActor" into devel/master
Adeel Kazmi [Thu, 2 Jul 2015 13:55:10 +0000 (06:55 -0700)]
Merge "Bug fix when creating background of control using ImageActor" into devel/master

9 years agoAdded GetReadPosition to AccessibilityManager API 94/42394/6
Tom Robinson [Fri, 26 Jun 2015 16:15:30 +0000 (17:15 +0100)]
Added GetReadPosition to AccessibilityManager API

As per request, re-added GetReadPosition to public API.

Change-Id: I2dddbfa24f732856fd3f5a233498873d29687423

9 years agoMerge "Show CopyPaste Poup on long press" into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 18:13:34 +0000 (11:13 -0700)]
Merge "Show CopyPaste Poup on long press" into devel/master

9 years agoMerge "Fix for grab/selection handle." into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 16:53:53 +0000 (09:53 -0700)]
Merge "Fix for grab/selection handle." into devel/master

9 years agoShow CopyPaste Poup on long press 86/42686/6
Agnelo Vaz [Wed, 1 Jul 2015 12:44:37 +0000 (13:44 +0100)]
Show CopyPaste Poup on long press

Change-Id: Ie57064747fd5df6827bc1cd6b0770acc9085d2fe
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoBug fix when creating background of control using ImageActor 41/42541/4
Ferran Sole [Mon, 29 Jun 2015 16:35:41 +0000 (17:35 +0100)]
Bug fix when creating background of control using ImageActor

Sort modifer was not beeing setted properly when background was created

Needs patch
"Added api to check actor's depth in the hierarchy" https://review.tizen.org/gerrit/#/c/42539/

Change-Id: Ia0ace26a620a78727bfe8976a5ceb96d318b940c

9 years agoMerge "DALi Version 1.0.47" into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 13:23:48 +0000 (06:23 -0700)]
Merge "DALi Version 1.0.47" into devel/master

9 years agoDALi Version 1.0.47 92/42692/1 dali_1.0.47
Ferran Sole [Wed, 1 Jul 2015 13:18:35 +0000 (14:18 +0100)]
DALi Version 1.0.47

Change-Id: I060ed9fb2e607b55ff2178bd4d88404bbbd0ef1b

9 years agoMerge "Refactored Button and derived classes, moving state change and transition...
Adeel Kazmi [Wed, 1 Jul 2015 12:58:27 +0000 (05:58 -0700)]
Merge "Refactored Button and derived classes, moving state change and transition logic to base class." into devel/master

9 years agoRefactored Button and derived classes, moving state change and transition logic to... 21/42321/18
Chu Hoang [Thu, 25 Jun 2015 15:41:58 +0000 (16:41 +0100)]
Refactored Button and derived classes, moving state change and transition logic to base class.

Added default images for PushButton, CheckBoxButton and RadioButton.

Change-Id: I0acd58074bf72eb7d9bc1f809ecc4de6bcc9aeb8

9 years agoFix for grab/selection handle. 48/42648/1
Victor Cebollada [Wed, 1 Jul 2015 07:54:07 +0000 (08:54 +0100)]
Fix for grab/selection handle.

Avoids to jump 2 characters of a Latin ligature. i.e ff, fi.

Change-Id: I0260f70f5aea1c134d1c1da7c178b170438723ac
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoFix for text cursor. 13/42613/3
Victor Cebollada [Tue, 30 Jun 2015 10:48:27 +0000 (11:48 +0100)]
Fix for text cursor.

Do not show the cursor when the text is selected.

Change-Id: I8af3dfbb78011744df3db22d0ccb44701d631ac7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoRemoved Text Basic Renderer and other minor fixes 74/42574/4
David Fumanal [Tue, 30 Jun 2015 08:22:11 +0000 (09:22 +0100)]
Removed Text Basic Renderer and other minor fixes

Change-Id: Ibfcdd221431de0969d905bfe77b9cb2956cec8b1

9 years agoJavaScript plugin build fix for keyboard focus manager 94/42594/1
Adeel Kazmi [Tue, 30 Jun 2015 11:11:39 +0000 (12:11 +0100)]
JavaScript plugin build fix for keyboard focus manager

Change-Id: I918b1f54fc787143f83379f5a6813da8faf80530

9 years agoMerge "Fix PageTurnView" into devel/master
Adeel Kazmi [Tue, 30 Jun 2015 10:25:53 +0000 (03:25 -0700)]
Merge "Fix PageTurnView" into devel/master

9 years agoMerge "Changes in Javascript plugin to compile under new mesh api" into devel/master
Adeel Kazmi [Tue, 30 Jun 2015 10:21:12 +0000 (03:21 -0700)]
Merge "Changes in Javascript plugin to compile under new mesh api" into devel/master

9 years agoMerge "OnActivated() change for Accessibility and KeyboardFocus" into devel/master
Adeel Kazmi [Tue, 30 Jun 2015 09:12:32 +0000 (02:12 -0700)]
Merge "OnActivated() change for Accessibility and KeyboardFocus" into devel/master

9 years agoPrevent selected text from being erased by Power button. 40/42540/2
Agnelo Vaz [Mon, 29 Jun 2015 15:47:17 +0000 (16:47 +0100)]
Prevent selected text from being erased by Power button.

Power button and Menu button are now consumed so don't erase selected text.

Change-Id: Idaa2f50f67d6c77e3062ec21a179a3c8d79d1fcc
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFix PageTurnView 43/42543/1
Xiangyin Ma [Mon, 29 Jun 2015 18:03:14 +0000 (19:03 +0100)]
Fix PageTurnView

Change-Id: I5fb24117006edcf97a117b7083c05001a2bc42fe

9 years agoMerge "Removed accidentally added files" into devel/master
Adeel Kazmi [Mon, 29 Jun 2015 17:25:01 +0000 (10:25 -0700)]
Merge "Removed accidentally added files" into devel/master

9 years agoMerge "Fix for selection handles." into devel/master
Adeel Kazmi [Mon, 29 Jun 2015 16:27:24 +0000 (09:27 -0700)]
Merge "Fix for selection handles." into devel/master

9 years agoRemoved accidentally added files 32/42532/1
Kimmo Hoikka [Mon, 29 Jun 2015 15:26:21 +0000 (16:26 +0100)]
Removed accidentally added files

Change-Id: Ifb82c884102cfb711dc1780ae4d832adfb961cc0

9 years agoText SelectAll and buttons shown depending on context 31/42531/2
Agnelo Vaz [Mon, 29 Jun 2015 14:45:44 +0000 (15:45 +0100)]
Text SelectAll and buttons shown depending on context

SelectAll shown if selecting text and not all text selected.
Default order of buttons changed

Change-Id: I587987e626f85d1110b1c0df03321505fee2b423
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoOnActivated() change for Accessibility and KeyboardFocus 95/42395/6
Tom Robinson [Fri, 26 Jun 2015 16:48:44 +0000 (17:48 +0100)]
OnActivated() change for Accessibility and KeyboardFocus

Change-Id: I26d9cb629133763562aea652c98b670d8d44f2e5

9 years agoFix for selection handles. 29/42529/2
Victor Cebollada [Mon, 29 Jun 2015 08:04:15 +0000 (09:04 +0100)]
Fix for selection handles.

Selection handles may remain pressed after the power button is pressed.

* The TouchEvent with Interrupt state is not handled.
  Actually Dali core does not send this event when the power button
  is pressed. This patch is a work-around to fix the issue.
  Would be a proper solution send the TouchEvent with the Interrupt
  state when the power button is pressed?

Change-Id: Ide9e69f74eb73f3ed1ce6d0ff918bd1177ba783c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoChanges in Javascript plugin to compile under new mesh api 04/42504/4
Ferran Sole [Mon, 29 Jun 2015 10:51:12 +0000 (11:51 +0100)]
Changes in Javascript plugin to compile under new mesh api

+ Removed RenderableActor api, which has been moved to ImageActor
+ Removed MeshActor api
+ Changed ShaderEffect api, which no longer support GeometryType
+ Changed build options so plugin builds automatically if v8 is installed

Change-Id: I089ad91188a38994bb2a9d726bd47b576cef12fd

9 years agoTableView does not require touch events by default 22/42522/2
Adeel Kazmi [Mon, 29 Jun 2015 13:32:43 +0000 (14:32 +0100)]
TableView does not require touch events by default

- Fixes issue with TextSelection popup.
- TableView inside button was consuming the event and so the button itself was never getting the
  leave or interrupted event to clear state

Change-Id: Ib3eda053053c47096db6f8d676ad4d87bd887e57

9 years agoMerge "System Clipboard shown and items can be pasted" into devel/master
Adeel Kazmi [Mon, 29 Jun 2015 11:25:43 +0000 (04:25 -0700)]
Merge "System Clipboard shown and items can be pasted" into devel/master

9 years agoSystem Clipboard shown and items can be pasted 78/42378/6
Agnelo Vaz [Fri, 26 Jun 2015 12:19:12 +0000 (13:19 +0100)]
System Clipboard shown and items can be pasted

Change-Id: I8703607879dd8e2c4ea2595ff24e6bbef579b145
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoTableView: Cleanup 92/42392/4
Xiangyin Ma [Fri, 26 Jun 2015 14:30:34 +0000 (15:30 +0100)]
TableView: Cleanup

Change-Id: Icc063e8d9c83efeeec0560ef1d02e1e79e0f0d53

9 years agoMerge branch 'devel/new_mesh' into devel/master 86/42386/2
Francisco Santos [Fri, 26 Jun 2015 14:24:45 +0000 (15:24 +0100)]
Merge branch 'devel/new_mesh' into devel/master

Change-Id: I41d2ce44857efc23c3a830ede52849b4d415b6f6

9 years agoMerge branch 'devel/master' into devel/new_mesh 81/42381/1 devel/new_mesh
Francisco Santos [Fri, 26 Jun 2015 14:09:53 +0000 (15:09 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Conflicts:
automated-tests/src/dali-toolkit/CMakeLists.txt

Change-Id: Id952401475048d0f19f9ab8757695175ec46056e

9 years agoFix cursor. 74/42374/1
Francisco Santos [Fri, 26 Jun 2015 13:13:53 +0000 (14:13 +0100)]
Fix cursor.

Change-Id: I522ab97e434d754723d3ed5bca3275f5e6d8e284

9 years agoText Field Highlight Patch 25/42325/3
Richard Underhill [Thu, 25 Jun 2015 17:47:15 +0000 (18:47 +0100)]
Text Field Highlight Patch

Change-Id: I28480bdb0148ffeb38cd1396f98a4e08d59211c2
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoChange control background to use ImageActor 62/42362/2
Ferran Sole [Fri, 26 Jun 2015 11:03:42 +0000 (12:03 +0100)]
Change control background to use ImageActor

Change-Id: I05db139b14c14ed85cb3550332460abe9d826610

9 years agoMerge branch 'devel/master' into devel/new_mesh 13/42313/3
Francisco Santos [Thu, 25 Jun 2015 14:23:06 +0000 (15:23 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Conflicts:
automated-tests/src/dali-toolkit/CMakeLists.txt
dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
dali-toolkit/internal/atlas-manager/atlas-manager.h
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.h
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
dali-toolkit/public-api/controls/control-impl.cpp

Change-Id: I48b90c6c4696dbc7b65659ecf6004a09a17c7ab0

9 years agoMerge "Minor fixes for Text." into devel/master
Paul Wisbey [Fri, 26 Jun 2015 10:35:58 +0000 (03:35 -0700)]
Merge "Minor fixes for Text." into devel/master

9 years agoText Selection Popup should hide when text inserted or set 03/42303/3
Agnelo Vaz [Thu, 25 Jun 2015 10:52:56 +0000 (11:52 +0100)]
Text Selection Popup should hide when text inserted or set

Select, Select All Popup should hide when predicitve text inserted.
Also if SetText is called then Popup should also hide

Change-Id: I39f05b49c49056c6b018eaec43431e7a9667194e
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoTextField to start edit mode when keyboard re-shown 23/42323/1
Agnelo Vaz [Thu, 25 Jun 2015 16:36:16 +0000 (17:36 +0100)]
TextField to start edit mode when keyboard re-shown

Change-Id: If8bda323256b7db2f3b91b8e2786f95c2aefa6c9
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMinor fixes for Text. 81/42181/3
Victor Cebollada [Wed, 24 Jun 2015 07:54:07 +0000 (08:54 +0100)]
Minor fixes for Text.

  - Fix the text cursor position when there is no text.
  - Remove some unnecesary booleans.

Change-Id: Iaf0cba9c1ccba11fc81c5594d7126553a60e393e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "(ItemLayout) Remove redundant GetResizeAnimation" into devel/master
Kimmo Hoikka [Thu, 25 Jun 2015 15:36:59 +0000 (08:36 -0700)]
Merge "(ItemLayout) Remove redundant GetResizeAnimation" into devel/master

9 years agoMerge "Script UTC test cases" into devel/master
Adeel Kazmi [Thu, 25 Jun 2015 15:31:14 +0000 (08:31 -0700)]
Merge "Script UTC test cases" into devel/master

9 years agoMerge "Add support for new accessibility actions" into devel/master
Adeel Kazmi [Thu, 25 Jun 2015 15:30:15 +0000 (08:30 -0700)]
Merge "Add support for new accessibility actions" into devel/master

9 years ago(ItemLayout) Remove redundant GetResizeAnimation 16/42316/1
Adeel Kazmi [Thu, 25 Jun 2015 14:38:10 +0000 (15:38 +0100)]
(ItemLayout) Remove redundant GetResizeAnimation

Change-Id: I11688a480ad0a37519f3ff35ab6d943fed23cc8a

9 years agoFix for problem in rendering, when removing and then re-adding a text control to... 46/40746/3
Richard Underhill [Thu, 25 Jun 2015 09:39:51 +0000 (10:39 +0100)]
Fix for problem in rendering, when removing and then re-adding a text control to the stage.

Change-Id: Id0aa77ef511e5e090b098aa49bfddcc1c3b2b7eb
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "TableView: Enum cleanup and Complete the SetCellAlignment() func" into devel...
Kimmo Hoikka [Thu, 25 Jun 2015 09:20:36 +0000 (02:20 -0700)]
Merge "TableView: Enum cleanup and Complete the SetCellAlignment() func" into devel/master

9 years agoMerge "UTC Builder coverage" into devel/master
Adeel Kazmi [Thu, 25 Jun 2015 08:08:39 +0000 (01:08 -0700)]
Merge "UTC Builder coverage" into devel/master

9 years agoDon't replace pasted text with pre-edit text 44/42244/1
Paul Wisbey [Wed, 24 Jun 2015 17:46:20 +0000 (18:46 +0100)]
Don't replace pasted text with pre-edit text

Change-Id: Iadd7d25177d6c9f98d7ff773baedc9319b4560cb

9 years agoAvoid deleting text behind the cursor 43/42243/1
Paul Wisbey [Wed, 24 Jun 2015 16:25:31 +0000 (17:25 +0100)]
Avoid deleting text behind the cursor

Change-Id: I198f70493b9340c67555671b083d8ccb354a249f

9 years agoUses depth within tree to set the depth index of text controls and their renderers. 42/42242/2
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>
9 years agoUTC Builder coverage 99/41999/2
Lee Morgan [Fri, 19 Jun 2015 13:28:50 +0000 (14:28 +0100)]
UTC Builder coverage

Change-Id: I549ff73d9c35075a8d47b85d903dede94284ea5f

9 years agoReplace Selection when text is entered 42/42142/8
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>