platform/core/uifw/dali-toolkit.git
9 years ago[dali_1.1.8] Merge branch 'devel/master' 13/50513/1
Nick Holland [Thu, 29 Oct 2015 10:32:28 +0000 (10:32 +0000)]
[dali_1.1.8] Merge branch 'devel/master'

Change-Id: I65b3b90f6057cff3786c329a2505520594ed7e2a

9 years agoDALi Version 1.1.8 09/50509/1 dali_1.1.8
Nick Holland [Thu, 29 Oct 2015 10:31:52 +0000 (10:31 +0000)]
DALi Version 1.1.8

Change-Id: I197fd63afc6b5ccdf0c666a4bbafc4264e61effc

9 years agoJavaScript binding for new mesh APIs 00/49300/13
Richard Huang [Mon, 12 Oct 2015 10:58:35 +0000 (11:58 +0100)]
JavaScript binding for new mesh APIs

Change-Id: Iec5fc37065d17b52aa3878b464df5681b9b6d775

9 years agoMerge "Refactored ControlRenderer so that derived classes are responsible for the...
Kimmo Hoikka [Tue, 27 Oct 2015 14:29:07 +0000 (07:29 -0700)]
Merge "Refactored ControlRenderer so that derived classes are responsible for the creation of the renderer." into devel/master

9 years agoMerge "Reimplemented CubeTransitionEffect to use renderers and removed usage of Image...
Kimmo Hoikka [Tue, 27 Oct 2015 14:24:58 +0000 (07:24 -0700)]
Merge "Reimplemented CubeTransitionEffect to use renderers and removed usage of ImageActor." into devel/master

9 years agoMerge "Enable setting of ScrollView properties within TextSelectionToolbar via json...
Paul Wisbey [Tue, 27 Oct 2015 13:35:21 +0000 (06:35 -0700)]
Merge "Enable setting of ScrollView properties within TextSelectionToolbar via json" into devel/master

9 years agoMerge "Fix IMF manager issues." into devel/master
Paul Wisbey [Tue, 27 Oct 2015 13:25:19 +0000 (06:25 -0700)]
Merge "Fix IMF manager issues." into devel/master

9 years agoRefactored ControlRenderer so that derived classes are responsible for the creation... 05/49605/10
Chu Hoang [Thu, 15 Oct 2015 10:48:26 +0000 (11:48 +0100)]
Refactored ControlRenderer so that derived classes are responsible for the creation of the renderer.

This allows ImageRenderer to fully manage the life cycle of the renderer, fixing the bug where changing an image in an ImageView whilsts it is on the stage also changes the cached renderer and therefore any other actor that used that cached renderer.

Change-Id: I2e8ba678445751c95c961f43da5be9a3f3cf1c58

9 years agoEnable setting of ScrollView properties within TextSelectionToolbar via json 22/50122/6
Agnelo Vaz [Fri, 23 Oct 2015 21:07:12 +0000 (22:07 +0100)]
Enable setting of ScrollView properties within TextSelectionToolbar via json

Change-Id: Ica91d0fa28532fe70582945fde8182008786e176
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFixed typo in BorderRenderer causing the overwriting of the cache's color shader... 67/50267/1
Chu Hoang [Tue, 27 Oct 2015 09:54:04 +0000 (09:54 +0000)]
Fixed typo in BorderRenderer causing the overwriting of the cache's color shader with border shader.

Change-Id: I0f2b38a70d9e6a9c38579f9b7c4226ab31a51175

9 years agoFix IMF manager issues. 20/50120/8
Victor Cebollada [Thu, 22 Oct 2015 14:52:39 +0000 (15:52 +0100)]
Fix IMF manager issues.

The text underline while pre-edit text differs from other solutions/toolkits i.e EFL or Android.

One use case that looks different is:
1) Type a word
2) Tap somewhere inside the word
3) Add more text. At this point the underline is visible in Dali but not in EFL or Android.

In addition if the text added in the step 3) is deleted, the underline remains in one character, which is wrong.

Another use case:
1) Type a word
2) Tap at the end of the last word of the text
3) Add more text. At this point the whole last word should be underlined as pre-edit. Sometimes it happens, sometimes it doesn't.

Change-Id: Ib0c76157260776296dfec34680bd200c1b3268f1
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Fixed typo in BorderRenderer causing the overwriting of the cache's quad geome...
Adeel Kazmi [Mon, 26 Oct 2015 15:53:28 +0000 (08:53 -0700)]
Merge "Fixed typo in BorderRenderer causing the overwriting of the cache's quad geometry with border geometry." into devel/master

9 years agoReimplemented CubeTransitionEffect to use renderers and removed usage of ImageActor. 44/50044/5
Chu Hoang [Mon, 19 Oct 2015 08:54:52 +0000 (09:54 +0100)]
Reimplemented CubeTransitionEffect to use renderers and removed usage of ImageActor.

Change-Id: If242a45c76a21046feea94af5ce3bac2290b3c2c

9 years agoMerge "Fixed typo in ImageView::GetNaturalSize()." into devel/master
Adeel Kazmi [Mon, 26 Oct 2015 10:44:26 +0000 (03:44 -0700)]
Merge "Fixed typo in ImageView::GetNaturalSize()." into devel/master

9 years agoFixed typo in BorderRenderer causing the overwriting of the cache's quad geometry... 66/50166/1
Chu Hoang [Mon, 26 Oct 2015 10:17:35 +0000 (10:17 +0000)]
Fixed typo in BorderRenderer causing the overwriting of the cache's quad geometry with border geometry.

Change-Id: I4acb48dfc074727b5ec1d8a0b9f4b68854730e8f

9 years agoMerge "ItemView: Fade off overshoot indicator when moving in opposite direction"...
Adeel Kazmi [Fri, 23 Oct 2015 15:09:20 +0000 (08:09 -0700)]
Merge "ItemView: Fade off overshoot indicator when moving in opposite direction" into devel/master

9 years agoFixed typo in ImageView::GetNaturalSize(). 14/50114/1
Chu Hoang [Fri, 23 Oct 2015 15:03:12 +0000 (16:03 +0100)]
Fixed typo in ImageView::GetNaturalSize().

Change-Id: I28621277e343e7159cf2ed023957965d830d586a

9 years agoMerge "DALi Version 1.1.7" into devel/master
Adeel Kazmi [Fri, 23 Oct 2015 14:19:19 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master

9 years agoMerge "Changed ShadowView to use new custom effects and ImageView." into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 13:04:58 +0000 (06:04 -0700)]
Merge "Changed ShadowView to use new custom effects and ImageView." into devel/master

9 years agoMerge "Fix text and control depth indices to have sane values" into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 12:29:44 +0000 (05:29 -0700)]
Merge "Fix text and control depth indices to have sane values" into devel/master

9 years agoItemView: Fade off overshoot indicator when moving in opposite direction 52/50052/1
Tom Robinson [Fri, 23 Oct 2015 11:01:40 +0000 (12:01 +0100)]
ItemView: Fade off overshoot indicator when moving in opposite direction

Change-Id: I09b1bde847c5859577e58734b1b68ff2af9e0abb

9 years ago[dali_1.1.7] Merge branch 'devel/master' 39/50039/1
Lee Morgan [Fri, 23 Oct 2015 10:00:59 +0000 (11:00 +0100)]
[dali_1.1.7] Merge branch 'devel/master'

Change-Id: I51e2dd26cb5e210757d50acdfe40e664cc572206

9 years agoDALi Version 1.1.7 35/50035/1 dali_1.1.7
Lee Morgan [Fri, 23 Oct 2015 10:00:39 +0000 (11:00 +0100)]
DALi Version 1.1.7

Change-Id: I37d9baf1f13629528d20010aa201c55b1dca1e8c

9 years agoFix text and control depth indices to have sane values 94/49994/1
Kimmo Hoikka [Thu, 22 Oct 2015 10:25:48 +0000 (11:25 +0100)]
Fix text and control depth indices to have sane values

no need to add the tree depth as that is already added by the algorithm

Change-Id: I3de4479328a78a3d42d0bdd58d2c411d77d18029

9 years agoAdded missing calls the base class Control::OnStageConnection etc in derived classes. 30/49930/1
Chu Hoang [Wed, 21 Oct 2015 15:42:40 +0000 (16:42 +0100)]
Added missing calls the base class Control::OnStageConnection etc in derived classes.

Change-Id: Ib17ca40519c8ccb9034b7327b79c955619f0d07b

9 years agoPreserve the ScrollBar alpha value from the stylesheet 21/49921/3
Paul Wisbey [Wed, 21 Oct 2015 13:26:47 +0000 (14:26 +0100)]
Preserve the ScrollBar alpha value from the stylesheet

The alpha value from stylesheet was lost when the indicator was shown
(it was hard-coded to 1.0f)

Change-Id: I67a063ff5f9dad3393ad494c44b75138fb55901f

9 years agoChanged ShadowView to use new custom effects and ImageView. 59/49659/4
Chu Hoang [Fri, 16 Oct 2015 15:06:01 +0000 (16:06 +0100)]
Changed ShadowView to use new custom effects and ImageView.

Change-Id: I250947e36e22596d0cfda6ef7dbff1d00b5af477

9 years agoMerge "Fix cursor position for ligatures and group of glyphs." into devel/master
Paul Wisbey [Tue, 20 Oct 2015 12:56:55 +0000 (05:56 -0700)]
Merge "Fix cursor position for ligatures and group of glyphs." into devel/master

9 years agoFixed issue that ItemView overshoot appears before it reaches the end of the list 03/49803/1
Richard Huang [Tue, 20 Oct 2015 10:38:31 +0000 (11:38 +0100)]
Fixed issue that ItemView overshoot appears before it reaches the end of the list

Change-Id: I8d8a6093e7494f091d7aa1254b0ff2d48d9f5ae2

9 years agoFix cursor position for ligatures and group of glyphs. 94/49794/1
Victor Cebollada [Tue, 20 Oct 2015 08:18:35 +0000 (09:18 +0100)]
Fix cursor position for ligatures and group of glyphs.

* Fix an issue with the Devanagari script.

Change-Id: I463d2171add2829f14039d8b2ac5bd68bafe151e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Changed Motion Blur and MotionStretch Effect to use new custom shaders." into...
Adeel Kazmi [Mon, 19 Oct 2015 16:58:28 +0000 (09:58 -0700)]
Merge "Changed Motion Blur and MotionStretch Effect to use new custom shaders." into devel/master

9 years agoMerge "Append clipboard text after current pre-edit text" into devel/master
Adeel Kazmi [Mon, 19 Oct 2015 14:52:49 +0000 (07:52 -0700)]
Merge "Append clipboard text after current pre-edit text" into devel/master

9 years agoAppend clipboard text after current pre-edit text 34/49734/3
Paul Wisbey [Mon, 19 Oct 2015 13:36:06 +0000 (14:36 +0100)]
Append clipboard text after current pre-edit text

Issue description:

1) Configure keyboard to show clipboard item
2) Type some text without pressing space
3) Use the keyboard clipboard short-cut to paste test whilst pre-text is shown
4) Then when the next character is typed, the pre-edit text reappears

Solution is to stop prediction before pasting (appending instead of replacing)

Change-Id: Ibd661e2f4d377c8333711e97c3c7a751caf8c15f

9 years agoScrollView moves in opposite direction sometimes when panning 02/49702/3
Tom Robinson [Mon, 19 Oct 2015 08:36:07 +0000 (09:36 +0100)]
ScrollView moves in opposite direction sometimes when panning

Change-Id: I0d68ce135cae455d04156aaa806584b8c22e4919

9 years agoReposition the grab/selection handles position. 18/49618/4
Victor Cebollada [Tue, 13 Oct 2015 10:16:20 +0000 (11:16 +0100)]
Reposition the grab/selection handles position.

Change-Id: Ifbdf3f6687920dbc13bc29bfd41ccd04c76af272
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoChanged Motion Blur and MotionStretch Effect to use new custom shaders. 20/49620/3
Chu Hoang [Thu, 15 Oct 2015 15:56:20 +0000 (16:56 +0100)]
Changed Motion Blur and MotionStretch Effect to use new custom shaders.

Change-Id: I0b03b593b7b203841f6df51fd4b02e25e6ea0233

9 years agoReposition Text Control's popup. 22/49322/4
Victor Cebollada [Mon, 12 Oct 2015 11:17:47 +0000 (12:17 +0100)]
Reposition Text Control's popup.

Change-Id: I0bc67d49a9b341033e7f9800a627c4ee0724bf52
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Text Shadow Implementation via copied renderer." into devel/master
Paul Wisbey [Thu, 15 Oct 2015 16:07:51 +0000 (09:07 -0700)]
Merge "Text Shadow Implementation via copied renderer." into devel/master

9 years agoMerge "Changed NPatchRenderer and ImageRenderer to use an "broken image" if they...
Kimmo Hoikka [Thu, 15 Oct 2015 15:07:20 +0000 (08:07 -0700)]
Merge "Changed NPatchRenderer and ImageRenderer to use an "broken image" if they try to renderer an invalid image." into devel/master

9 years agoText Shadow Implementation via copied renderer. 65/49465/8
Richard Underhill [Thu, 15 Oct 2015 13:25:00 +0000 (14:25 +0100)]
Text Shadow Implementation via copied renderer.

Change-Id: I1549e0b0c788b252ad176210f503c76397112e51
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoProvide TextChanged() signal after PASTE 09/49609/1
Paul Wisbey [Thu, 15 Oct 2015 11:41:09 +0000 (12:41 +0100)]
Provide TextChanged() signal after PASTE

Change-Id: Id17a4fdd58426aa016ae0ead597ed35a9c6d5b09

9 years agoRemove some dead and non-thread safe internal uniforms 46/49546/1
Kimmo Hoikka [Wed, 14 Oct 2015 15:57:33 +0000 (16:57 +0100)]
Remove some dead and non-thread safe internal uniforms

Change-Id: I41058f8813f04a83f1b22cc38c71106a9b12b77a

9 years agoMerge "Changed Distance Field effect effect to use new custom shaders." into devel...
Kimmo Hoikka [Wed, 14 Oct 2015 15:25:00 +0000 (08:25 -0700)]
Merge "Changed Distance Field effect effect to use new custom shaders." into devel/master

9 years agoMerge "Comment correction for Disambiguated function" into devel/master
Paul Wisbey [Wed, 14 Oct 2015 13:52:10 +0000 (06:52 -0700)]
Merge "Comment correction for Disambiguated function" into devel/master

9 years agoChanged Distance Field effect effect to use new custom shaders. 28/49528/4
Chu Hoang [Wed, 14 Oct 2015 10:53:40 +0000 (11:53 +0100)]
Changed Distance Field effect effect to use new custom shaders.

Change-Id: Ia8cc4142b68a51880d142ba4dbf7b01f61e271c4

9 years agoChanged NPatchRenderer and ImageRenderer to use an "broken image" if they try to... 28/48728/11
Chu Hoang [Fri, 25 Sep 2015 10:17:43 +0000 (11:17 +0100)]
Changed NPatchRenderer and ImageRenderer to use an "broken image" if they try to renderer an invalid image.

Change-Id: I9cc4146dd2d7c8e775a63c774937d3bd1ab47b7d

9 years agoComment correction for Disambiguated function 25/49525/1
Agnelo Vaz [Wed, 14 Oct 2015 09:42:09 +0000 (10:42 +0100)]
Comment correction for Disambiguated function

Change-Id: I1b37d4ab53e048a501be1aeeb00723241bce4938
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "DGEUF-110: Limit ScrollView to scroll maximum 1 page on flick" into devel...
Kimmo Hoikka [Wed, 14 Oct 2015 09:37:01 +0000 (02:37 -0700)]
Merge "DGEUF-110: Limit ScrollView to scroll maximum 1 page on flick" into devel/master

9 years agoDGEUF-110: Limit ScrollView to scroll maximum 1 page on flick 48/49448/5
Tom Robinson [Tue, 13 Oct 2015 09:50:49 +0000 (10:50 +0100)]
DGEUF-110: Limit ScrollView to scroll maximum 1 page on flick

Change-Id: I92b4c665c7c771b5ddb0667ebdf024bd640ae81b

9 years agoChanges following "Remove Sampler scene object" 19/49119/6
Ferran Sole [Tue, 6 Oct 2015 15:50:53 +0000 (16:50 +0100)]
Changes following "Remove Sampler scene object"

Change-Id: I7934f6d0c516687c252f49509812f2a87becff3a

9 years agoMerge "Implemented n-patch rendering for NPatchRenderer." into devel/master
Kimmo Hoikka [Tue, 13 Oct 2015 14:03:57 +0000 (07:03 -0700)]
Merge "Implemented n-patch rendering for NPatchRenderer." into devel/master

9 years agoImplemented n-patch rendering for NPatchRenderer. 38/48538/12
Chu Hoang [Tue, 22 Sep 2015 13:21:17 +0000 (14:21 +0100)]
Implemented n-patch rendering for NPatchRenderer.

Change-Id: Ic7304dc47483cc228dce9e715be9bc0bb46a081e

9 years agoMerge "Remove dead constraint function from GaussianBlurView" into devel/master
Kimmo Hoikka [Tue, 13 Oct 2015 10:55:16 +0000 (03:55 -0700)]
Merge "Remove dead constraint function from GaussianBlurView" into devel/master

9 years agoRemove dead constraint function from GaussianBlurView 49/49449/1
Kimmo Hoikka [Tue, 13 Oct 2015 09:51:54 +0000 (10:51 +0100)]
Remove dead constraint function from GaussianBlurView

Change-Id: I1c71f35a99d3263de0348b605f88cd56f6a5deea

9 years agoUpdate scroll end effect GUI 42/48542/12
Jonghyun Ho [Tue, 22 Sep 2015 04:40:54 +0000 (13:40 +0900)]
Update scroll end effect GUI

Change-Id: I8d11ff97bed46ffc3c8fa2bada37adeffe9f6c5e

9 years agoMerge "Refactor to remove ControlRenderer::mCachedRenderer member." into devel/master
Kimmo Hoikka [Mon, 12 Oct 2015 17:27:02 +0000 (10:27 -0700)]
Merge "Refactor to remove ControlRenderer::mCachedRenderer member." into devel/master

9 years agoMerge "Move common images folder to the style folder" into devel/master
Kimmo Hoikka [Mon, 12 Oct 2015 14:54:43 +0000 (07:54 -0700)]
Merge "Move common images folder to the style folder" into devel/master

9 years agoRefactor to remove ControlRenderer::mCachedRenderer member. 26/49226/4
Chu Hoang [Fri, 9 Oct 2015 09:05:44 +0000 (10:05 +0100)]
Refactor to remove ControlRenderer::mCachedRenderer member.

Change-Id: I4ba5ccc62b5de25a76f21401b3914efa06a41649

9 years ago[dali_1.1.6] Merge branch 'devel/master' 35/49235/1
Tom Robinson [Fri, 9 Oct 2015 09:49:17 +0000 (10:49 +0100)]
[dali_1.1.6] Merge branch 'devel/master'

Change-Id: I1d00c300da2b1b3fd986f4752a7a4d8531ffb576

9 years agoDALi Version 1.1.6 31/49231/1 dali_1.1.6
Tom Robinson [Fri, 9 Oct 2015 09:48:47 +0000 (10:48 +0100)]
DALi Version 1.1.6

Change-Id: Idedbf00fc557c74c1624eb90cdab36c4db57af04

9 years agoMove common images folder to the style folder 21/49221/1
Agnelo Vaz [Thu, 8 Oct 2015 16:18:20 +0000 (17:18 +0100)]
Move common images folder to the style folder

* Keep images all under the style folder to encourage correct placement of images and not just all in common

Change-Id: Id16410b6c88de4c8b1b642113906a85cd74a7a23
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoDifferent image sets depending on style selected 66/49166/4
Agnelo Vaz [Wed, 7 Oct 2015 10:39:41 +0000 (11:39 +0100)]
Different image sets depending on style selected

* Style folders now contain an image directory
* Images specific to that style (resolution) should be placed in that folder
* Toolkit has an image-common folder for images that span all styles
* Only TextField Images moved to style image folders in this patch

Change-Id: I43d792c4f42dafb4b39e409425e51d404d261838
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge changes I48753b8f,If7ef493d into devel/master
Kimmo Hoikka [Thu, 8 Oct 2015 09:57:19 +0000 (02:57 -0700)]
Merge changes I48753b8f,If7ef493d into devel/master

* changes:
  Added a RendererCache and utilise it for ImageRenderer.
  Added ImageView::OnStageConnect to pass the onstage event to the renderer.

9 years agoAdded a RendererCache and utilise it for ImageRenderer. 40/49040/8
Chu Hoang [Mon, 5 Oct 2015 14:10:36 +0000 (15:10 +0100)]
Added a RendererCache and utilise it for ImageRenderer.

Tidied up ControlRenderer::DoInitialize methods.
Added ControlRerenderer::SetCachedRendererKey method to set a key and enable base ControlRenderer to cache core renderers from this key.
Added  RendererFactoryCache::Get/Save/RemoveRenderer methods.

Change-Id: I48753b8fe18293ca53477e149f00018c50122bb0

9 years agoMerge "Change default grab/selection handles." into devel/master
Kimmo Hoikka [Wed, 7 Oct 2015 11:51:38 +0000 (04:51 -0700)]
Merge "Change default grab/selection handles." into devel/master

9 years agoRemove SELECTION_CHANGED state from the text controller. 20/49120/1
Victor Cebollada [Tue, 6 Oct 2015 15:49:49 +0000 (16:49 +0100)]
Remove SELECTION_CHANGED state from the text controller.

* This state is not different than the SELECTING one.

Change-Id: If6f791a021ae4511a42ba9999788568d2eff5508
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoChange default grab/selection handles. 41/49041/3
Victor Cebollada [Mon, 5 Oct 2015 13:24:32 +0000 (14:24 +0100)]
Change default grab/selection handles.

Change-Id: I958f287f5b79a65f0d9250ebc970c8df0752db65
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoAdded ImageView::OnStageConnect to pass the onstage event to the renderer. 39/49039/2
Chu Hoang [Mon, 5 Oct 2015 15:34:34 +0000 (16:34 +0100)]
Added ImageView::OnStageConnect to pass the onstage event to the renderer.

Change-Id: If7ef493d065b4a1b3b67bb0b1a6fdef91a2762d1

9 years agoChange geometry to use triangle strip 91/48991/4
Xiangyin Ma [Fri, 2 Oct 2015 14:55:25 +0000 (15:55 +0100)]
Change geometry to use triangle strip

Change-Id: Ie35aec87ba51285fc682310baa4f3842b7c8fe68

9 years agoMerge "Fix cursor position issues." into devel/master
Paul Wisbey [Fri, 2 Oct 2015 14:51:22 +0000 (07:51 -0700)]
Merge "Fix cursor position issues." into devel/master

9 years agoFix cursor position issues. 23/48923/5
Victor Cebollada [Tue, 22 Sep 2015 14:50:28 +0000 (15:50 +0100)]
Fix cursor position issues.

* Fixes the Test Case broken in a previous patch.
* Fixes the scroll position after deleting the last characters.
* Fixes minor cursor position issues caused in a previous patch.

The previous patch: https://review.tizen.org/gerrit/#/c/48450/

Change-Id: I127c0bedccdd6a8c3923f877f07a36eecbf5c7e1
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years ago(GradientRenderer)Respond to actor size change automatically when using ObjectBoundin... 26/48926/3
Xiangyin Ma [Thu, 1 Oct 2015 18:09:47 +0000 (19:09 +0100)]
(GradientRenderer)Respond to actor size change automatically when using ObjectBoundingBox as units

Change-Id: Idad68fa70d4dc5edd640ef022071d178172867cb

9 years agoMerge "Fix the cursor position when retrieving the selected text." into devel/master
Paul Wisbey [Fri, 2 Oct 2015 10:47:18 +0000 (03:47 -0700)]
Merge "Fix the cursor position when retrieving the selected text." into devel/master

9 years ago[dali_1.1.5] Merge branch 'devel/master' 79/48979/1
Chu Hoang [Fri, 2 Oct 2015 09:39:14 +0000 (10:39 +0100)]
[dali_1.1.5] Merge branch 'devel/master'

Change-Id: I2e16bbff8532a10e8b997abc1e536343c12bd737

9 years agoDALi Version 1.1.5 75/48975/1 dali_1.1.5
Chu Hoang [Fri, 2 Oct 2015 09:38:50 +0000 (10:38 +0100)]
DALi Version 1.1.5

Change-Id: I8b6044ffeab871bd64c1234055eea3b8a305a6ea

9 years agoMerge "Implemented custom shader in ImageRenderer and changed Dissolve-effect to...
Kimmo Hoikka [Thu, 1 Oct 2015 18:03:03 +0000 (11:03 -0700)]
Merge "Implemented custom shader in ImageRenderer and changed Dissolve-effect to utilise this." into devel/master

9 years agoMerge "Render control background without creating extra actor" into devel/master
Kimmo Hoikka [Thu, 1 Oct 2015 17:26:44 +0000 (10:26 -0700)]
Merge "Render control background without creating extra actor" into devel/master

9 years agoImplemented custom shader in ImageRenderer and changed Dissolve-effect to utilise... 87/48787/6
Chu Hoang [Mon, 28 Sep 2015 15:55:44 +0000 (16:55 +0100)]
Implemented custom shader in ImageRenderer and changed Dissolve-effect to utilise this.

Change-Id: I3275449610040b533cca265445c4c1a65a35b404

9 years agoMerge "Fix for shadow 'leak' reported on SPIN homescreen." into devel/master
Kimmo Hoikka [Thu, 1 Oct 2015 16:06:04 +0000 (09:06 -0700)]
Merge "Fix for shadow 'leak' reported on SPIN homescreen." into devel/master

9 years agoMerge "Do not reposition the text's popup when buttons are pressed." into devel/master
Paul Wisbey [Thu, 1 Oct 2015 15:49:52 +0000 (08:49 -0700)]
Merge "Do not reposition the text's popup when buttons are pressed." into devel/master

9 years agoFix the cursor position when retrieving the selected text. 22/48922/2
Victor Cebollada [Thu, 1 Oct 2015 13:59:31 +0000 (14:59 +0100)]
Fix the cursor position when retrieving the selected text.

* The cursor shouldn't be updated when the selected text is retrieved unless
  is deleted after retrieval.

Change-Id: Ib6e53ce41199fd3b62c59effedcd42d2b70d6158
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoRender control background without creating extra actor 62/48762/3
Xiangyin Ma [Mon, 28 Sep 2015 17:34:35 +0000 (18:34 +0100)]
Render control background without creating extra actor

Change-Id: Ifda38ccf7da36fce360faca7dcbea58c0044d8ad

9 years agoFix for shadow 'leak' reported on SPIN homescreen. 36/48836/3
Richard Underhill [Wed, 30 Sep 2015 10:24:48 +0000 (11:24 +0100)]
Fix for shadow 'leak' reported on SPIN homescreen.

Clean up multiple render tasks for shadows.

Change-Id: I298b3ea4f733eb51ba3041192a3591940b735e9d
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Removing GetDefaultFontDescription from Platform Abstraction Test" into devel...
Paul Wisbey [Wed, 30 Sep 2015 09:40:26 +0000 (02:40 -0700)]
Merge "Removing GetDefaultFontDescription from Platform Abstraction Test" into devel/master

9 years agoMerge "Ensure UserDefined Font family is not changed by system font changing." into...
Paul Wisbey [Tue, 29 Sep 2015 10:39:08 +0000 (03:39 -0700)]
Merge "Ensure UserDefined Font family is not changed by system font changing." into devel/master

9 years agoMerge "Create property map from ControlRenderer and make SetOffStage API public"...
Adeel Kazmi [Tue, 29 Sep 2015 08:30:09 +0000 (01:30 -0700)]
Merge "Create property map from ControlRenderer and make SetOffStage API public" into devel/master

9 years agoCreate property map from ControlRenderer and make SetOffStage API public 42/48742/7
Xiangyin Ma [Fri, 25 Sep 2015 16:08:33 +0000 (17:08 +0100)]
Create property map from ControlRenderer and make SetOffStage API public

Change-Id: Id0df6b9aa509c7add2d87619b22c043035a3b7ad

9 years agoRemoving GetDefaultFontDescription from Platform Abstraction Test 61/48761/1
Agnelo Vaz [Mon, 28 Sep 2015 16:19:30 +0000 (17:19 +0100)]
Removing GetDefaultFontDescription from Platform Abstraction Test

* Font client now provides this functionality and this API now removed from platform abstraction

Change-Id: I79546ebfe6cd51dab297bcfaf60c168a23793fa3
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoRearrange doxygen tags for recently deprecated or new APIs 57/48757/1
Adeel Kazmi [Mon, 28 Sep 2015 15:21:07 +0000 (16:21 +0100)]
Rearrange doxygen tags for recently deprecated or new APIs

Change-Id: Ie4b387e3b4267cd9895a5d0d07b8ec5a638ee7f2

9 years agoEnsure UserDefined Font family is not changed by system font changing. 43/48743/1
Agnelo Vaz [Fri, 25 Sep 2015 16:31:25 +0000 (17:31 +0100)]
Ensure UserDefined Font family is not changed by system font changing.

Change-Id: I6c99511a70cb86c96c50c918abe000ab802f2158
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years ago[dali_1.1.4] Merge branch 'devel/master' 17/48717/1
Adeel Kazmi [Fri, 25 Sep 2015 07:46:35 +0000 (08:46 +0100)]
[dali_1.1.4] Merge branch 'devel/master'

Change-Id: I7d620bb95b904588ad20fa2f4aea5264aee868aa

9 years agoDALi Version 1.1.4 13/48713/1 dali_1.1.4
Adeel Kazmi [Fri, 25 Sep 2015 07:46:09 +0000 (08:46 +0100)]
DALi Version 1.1.4

Change-Id: Ib17e79146282cf44befaa436deb461c40aa68e9b

9 years agoMerge "Modify doxygen group names" into devel/master
Adeel Kazmi [Thu, 24 Sep 2015 15:30:49 +0000 (08:30 -0700)]
Merge "Modify doxygen group names" into devel/master

9 years agoModify doxygen group names 54/48654/3
Yoonsang Lee [Thu, 24 Sep 2015 07:46:10 +0000 (16:46 +0900)]
Modify doxygen group names

- "-" in group names causes javascript errors when used in doxygen
1.7.6.1 with GENERATE_TREEVIEW option - by which Tizen API reference
is generated (not sure for later version)
- It makes DALi items in the tree view cannot be opened.
- Replace all "-" to "_" in doxygen group names to solve the problem.
- Arrange redundant doxygen input path

Change-Id: I203b63f685b7a7d6846337c4c395913d584cf2ec

9 years agoStop leaking render-tasks for Text Shadows 78/48678/2
Paul Wisbey [Thu, 24 Sep 2015 14:15:06 +0000 (15:15 +0100)]
Stop leaking render-tasks for Text Shadows

Change-Id: I652c7e96f1c1ac16ac27c948d462286079e2cb1e

9 years agoMerge "Marked new API's since 1.1.4" into devel/master
Adeel Kazmi [Thu, 24 Sep 2015 13:09:46 +0000 (06:09 -0700)]
Merge "Marked new API's since 1.1.4" into devel/master

9 years agoMarked new API's since 1.1.4 12/48612/3
Lee Morgan [Wed, 23 Sep 2015 15:08:58 +0000 (16:08 +0100)]
Marked new API's since 1.1.4

Change-Id: If9a08adf68f6c236c8bfac37199b1901d6dbcdd1

9 years agoImplementation of BorderRenderer and apply it to Magnifier 44/48544/6
Xiangyin Ma [Tue, 22 Sep 2015 16:09:28 +0000 (17:09 +0100)]
Implementation of BorderRenderer and apply it to Magnifier

Change-Id: I94c915e7c1530c10654d5458965765eb7d2431de

9 years agoUpdate the stylesheet with the Control property change 74/48374/5
Xiangyin Ma [Fri, 18 Sep 2015 12:55:10 +0000 (13:55 +0100)]
Update the stylesheet with the Control property change

Change-Id: I25929a8e4c531d22081093d795eee38464a0b5d0

9 years agoInitial implemention NPatchRenderer only for 9 patch case. 56/48456/11
Chu Hoang [Mon, 21 Sep 2015 09:56:09 +0000 (10:56 +0100)]
Initial implemention NPatchRenderer only for 9 patch case.

Change-Id: I0fb00583b6b1dc8b76716083b811c79062f36768