platform/core/uifw/dali-toolkit.git
8 years ago[dali_1.1.13] Merge branch 'devel/master' 92/53392/1
Xiangyin Ma [Fri, 4 Dec 2015 11:03:48 +0000 (11:03 +0000)]
[dali_1.1.13] Merge branch 'devel/master'

Change-Id: Icc4b04e233366d1931753aa73ba804339c4a380a

8 years agoDALi Version 1.1.13 88/53388/1 dali_1.1.13
Xiangyin Ma [Fri, 4 Dec 2015 11:03:02 +0000 (11:03 +0000)]
DALi Version 1.1.13

Change-Id: If64296973c91bb2d62e32b9fcb9ac7c40e2a70d7

8 years agoFix the segmentation fault error cause by ImageAtlas when application quiting 91/53091/1
Xiangyin Ma [Tue, 1 Dec 2015 18:36:07 +0000 (18:36 +0000)]
Fix the segmentation fault error cause by ImageAtlas when application quiting

Change-Id: Idcb694b29b39c055060c26190d47a5a9eddb17c5

8 years agoremove the duplicate properties from ColorRenderer and BorderRenderer 99/52999/2
Xiangyin Ma [Mon, 30 Nov 2015 17:47:38 +0000 (17:47 +0000)]
remove the duplicate properties from ColorRenderer and BorderRenderer

Change-Id: I7689ae4e97882061b09f643481115f6d1d6b6f29

8 years agoSupport of creating BufferImage from pixel buffer in JavaScript 39/52939/3
Richard Huang [Fri, 27 Nov 2015 15:33:26 +0000 (15:33 +0000)]
Support of creating BufferImage from pixel buffer in JavaScript

Change-Id: Ifebd75c46e45ae56aedd75708279c54c35b33fdb

8 years ago[dali_1.1.12] Merge branch 'devel/master' 90/52890/1
Adeel Kazmi [Fri, 27 Nov 2015 10:17:46 +0000 (10:17 +0000)]
[dali_1.1.12] Merge branch 'devel/master'

Change-Id: I219814251150a6b0e45bca925809efb87c80a646

8 years agoDALi Version 1.1.12 86/52886/1 dali_1.1.12
Adeel Kazmi [Fri, 27 Nov 2015 10:17:17 +0000 (10:17 +0000)]
DALi Version 1.1.12

Change-Id: If5ed4c84f43c60deaf48a8a43cf514bf86dca376

8 years agoFix initial value for matrix property registration 53/52853/1
Nick Holland [Thu, 26 Nov 2015 15:36:12 +0000 (15:36 +0000)]
Fix initial value for matrix property registration

Currently the full contents of imat is not set to the
viewMatrix property.

var imat = [1,0,0,0,
   0,1,0,0,
           0,0,1,0,
           0,0,0,1];
shader.registerAnimatableProperty('viewMatrix', imat);

Change-Id: I25c76b0dc34e5238316b1bc571d8c8cc4ce8cedc

8 years ago(Image Atlas) Fix helgrind simultaneous access issue 46/52646/1
Adeel Kazmi [Wed, 25 Nov 2015 09:46:10 +0000 (09:46 +0000)]
(Image Atlas) Fix helgrind simultaneous access issue

Change-Id: I948c61ab962bd1469cafae82c7ee5c8709c722f0

8 years ago(AutomatedTests) Ensure warnings are shown as errors 28/52428/7
Adeel Kazmi [Mon, 23 Nov 2015 10:06:46 +0000 (10:06 +0000)]
(AutomatedTests) Ensure warnings are shown as errors

Change-Id: Ib85ad8c51010017f8911d9295df0d2f8240ef81f

8 years agoMerge "Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and...
Adeel Kazmi [Fri, 20 Nov 2015 15:58:50 +0000 (07:58 -0800)]
Merge "Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect" into devel/master

8 years agoMerge "Check glyphs are laid out in text-view." into devel/master
Paul Wisbey [Fri, 20 Nov 2015 13:59:40 +0000 (05:59 -0800)]
Merge "Check glyphs are laid out in text-view." into devel/master

8 years ago[dali_1.1.11] Merge branch 'devel/master' 84/52284/1
Richard Huang [Fri, 20 Nov 2015 10:58:42 +0000 (10:58 +0000)]
[dali_1.1.11] Merge branch 'devel/master'

Change-Id: I2f8dc25ac8abdf00cbcfc6a6e1f97e711a34635e

8 years agoDALi Version 1.1.11 80/52280/1 dali_1.1.11
Richard Huang [Fri, 20 Nov 2015 10:58:18 +0000 (10:58 +0000)]
DALi Version 1.1.11

Change-Id: I93cf02d11e6a55b17fb59c50838c5d06be00b60e

8 years agoCheck glyphs are laid out in text-view. 48/52148/3
Victor Cebollada [Thu, 19 Nov 2015 09:14:23 +0000 (09:14 +0000)]
Check glyphs are laid out in text-view.

* Check there are glyphs laid out before performing operations

Change-Id: I508959209b405522501b47832e158042bf09d52c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoRemove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect 74/51974/14
Richard Huang [Tue, 17 Nov 2015 17:36:10 +0000 (17:36 +0000)]
Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect

Change-Id: Ic68322b4114459c11c4147c224ebf2eaafc055a4

8 years agoMerge "Programming guide of DebugRenderer" into devel/master
Adeel Kazmi [Thu, 19 Nov 2015 15:02:30 +0000 (07:02 -0800)]
Merge "Programming guide of DebugRenderer" into devel/master

9 years agoFix the Slider and Scrollbar issue with nine patch image 60/52060/3
Xiangyin Ma [Wed, 18 Nov 2015 14:45:45 +0000 (14:45 +0000)]
Fix the Slider and Scrollbar issue with nine patch image

Change-Id: Ieb9843466d112205bf360649502e23f38ab8313f

9 years agoProgramming guide of DebugRenderer 68/52168/2
Xiangyin Ma [Thu, 19 Nov 2015 11:50:30 +0000 (11:50 +0000)]
Programming guide of DebugRenderer

Change-Id: I2208e8a63321667c52943ab7826afef85c3d9c41

9 years agoMerge "Fix UTC prevent issue" into devel/master
Adeel Kazmi [Thu, 19 Nov 2015 10:51:01 +0000 (02:51 -0800)]
Merge "Fix UTC prevent issue" into devel/master

9 years agoDo not use image atlasing for remote image resource 70/52070/3
Richard Huang [Wed, 18 Nov 2015 18:05:06 +0000 (18:05 +0000)]
Do not use image atlasing for remote image resource

Change-Id: I1fd0999d5c93aba02d378565f2ab71b7cf36dc74

9 years agoMerge "Debug renderer" into devel/master
Kimmo Hoikka [Wed, 18 Nov 2015 17:29:25 +0000 (09:29 -0800)]
Merge "Debug renderer" into devel/master

9 years agoControl not always rendering background image depending on add order 31/52031/4
Tom Robinson [Wed, 18 Nov 2015 10:33:03 +0000 (10:33 +0000)]
Control not always rendering background image depending on add order

Change-Id: Ie16a55fd59278d65f8665994972cb90708a4891e

9 years agoDebug renderer 65/51565/5
Xiangyin Ma [Tue, 10 Nov 2015 15:13:30 +0000 (15:13 +0000)]
Debug renderer

Change-Id: Id7dafc9872e5a4f1478641f60a0e2ba1bfff905f

9 years agoFix UTC prevent issue 15/52015/1
taeyoon [Wed, 18 Nov 2015 08:12:37 +0000 (17:12 +0900)]
Fix UTC prevent issue

Change-Id: Ibbc41bd7ef9a5bbb9138bf68ffff8e8506340a3b

9 years agoMerge "Adding TextField Popup behaviour to (Programming) Guide" into devel/master
Paul Wisbey [Tue, 17 Nov 2015 17:36:54 +0000 (09:36 -0800)]
Merge "Adding TextField Popup behaviour to (Programming) Guide" into devel/master

9 years agoMerge "Changed button to use ImageView instead of ImageActor and enabled custom fragm...
Kimmo Hoikka [Tue, 17 Nov 2015 17:07:25 +0000 (09:07 -0800)]
Merge "Changed button to use ImageView instead of ImageActor and enabled custom fragment shaders for n-path renderer" into devel/master

9 years agoMerge "(ImageRenderer)Stop the duplicated image loading when using custom shader...
Kimmo Hoikka [Tue, 17 Nov 2015 17:07:14 +0000 (09:07 -0800)]
Merge "(ImageRenderer)Stop the duplicated image loading when using custom shader" into devel/master

9 years agoAdding TextField Popup behaviour to (Programming) Guide 46/51846/4
Agnelo Vaz [Mon, 16 Nov 2015 12:26:33 +0000 (12:26 +0000)]
Adding TextField Popup behaviour to (Programming) Guide

Change-Id: I370988ae201d0b3ecabb62061bf9fb57b8f78930
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoTextSelection Popup to be aware of requirement to Paste and whitespace selectable 71/51571/12
Agnelo Vaz [Tue, 10 Nov 2015 17:31:20 +0000 (17:31 +0000)]
TextSelection Popup to be aware of requirement to Paste and whitespace selectable

* This shows the [PASTE][CLIPBOARD] buttons when a tap occurs in edit mode (if something to paste)
* To see [select][select all] longpress or double tap text
* Whitespace can be selected by double tap or longpress
* TextAtlasRenderer returns a renderable actor even when all text is whitespace

Change-Id: I1ac5cd1f76e554b1c9d59ef8b8f64fe741aa6855
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoChanged button to use ImageView instead of ImageActor and enabled custom fragment... 40/51740/13
Chu Hoang [Fri, 13 Nov 2015 09:58:09 +0000 (09:58 +0000)]
Changed button to use ImageView instead of ImageActor and enabled custom fragment shaders for n-path renderer

Change-Id: I3edcb09f229e2b00fc14cae0a0215cf396a0ae58

9 years ago(ImageRenderer)Stop the duplicated image loading when using custom shader 52/51652/4
Xiangyin Ma [Wed, 11 Nov 2015 18:54:38 +0000 (18:54 +0000)]
(ImageRenderer)Stop the duplicated image loading when using custom shader

Change-Id: I972730e63d40ac0305d4299fcdedbe66bf312aff

9 years ago(ImageView) Restore erroneously removed APIs & Fix SetImage behaviour 26/51826/7
Adeel Kazmi [Mon, 16 Nov 2015 10:55:34 +0000 (10:55 +0000)]
(ImageView) Restore erroneously removed APIs & Fix SetImage behaviour

SetImage Issues fixed:
- SetImage should NOT show an error image if empty/NULL. It should show nothing as per API description.
- Changing between types (Image type to URL, property-map to Image etc.) did not work properly.
- Ensure a RelayoutRequest is done when SetImage is called so that our size is renegotiated.

Change-Id: I066130a697b7791f791b5b9b63733ec482ceaed6

9 years agoMerge "DALi Version 1.1.10" into devel/master
Adeel Kazmi [Fri, 13 Nov 2015 16:41:02 +0000 (08:41 -0800)]
Merge "DALi Version 1.1.10" into devel/master

9 years ago[dali_1.1.10] Merge branch 'devel/master' 75/51775/1
Adeel Kazmi [Fri, 13 Nov 2015 16:34:18 +0000 (16:34 +0000)]
[dali_1.1.10] Merge branch 'devel/master'

Change-Id: Ic2a625b5362001e1766cd863f1d069b3eec810c5

9 years agoDALi Version 1.1.10 71/51771/1 dali_1.1.10
Adeel Kazmi [Fri, 13 Nov 2015 16:33:48 +0000 (16:33 +0000)]
DALi Version 1.1.10

Change-Id: Iff295a71e6743f45d367e087d96bfa577cbc51e1

9 years agoRemove NinePatchMaskEffect 43/51643/4
Chu Hoang [Wed, 11 Nov 2015 15:53:00 +0000 (15:53 +0000)]
Remove NinePatchMaskEffect

Change-Id: Ib3f5c029ea7f80a559edcbc631db968cd1656bed

9 years agoUpdated Programming guide. 07/51707/4
Chu Hoang [Thu, 12 Nov 2015 13:19:00 +0000 (13:19 +0000)]
Updated Programming guide.

Updated Control background with a section about renderers.
Updated ImageActor section.
Added ImageView section.
Updated ShaderEffects section.

Change-Id: Ib3df5abf69e789311d58b95a115caddc3b6ab63c

9 years agoMerge "Remove instances of finding a property before RegisterProperty" into devel...
Kimmo Hoikka [Thu, 12 Nov 2015 18:24:33 +0000 (10:24 -0800)]
Merge "Remove instances of finding a property before RegisterProperty" into devel/master

9 years agoMerge "Added generic signal binding for toolkit controls in JavaScript" into devel...
Adeel Kazmi [Thu, 12 Nov 2015 17:18:38 +0000 (09:18 -0800)]
Merge "Added generic signal binding for toolkit controls in JavaScript" into devel/master

9 years agoRemove instances of finding a property before RegisterProperty 05/51705/1
Adeel Kazmi [Thu, 12 Nov 2015 11:20:46 +0000 (11:20 +0000)]
Remove instances of finding a property before RegisterProperty

This is because RegisterProperty checks whether the property has been registered before, and just calls
SetProperty it it has been.

Change-Id: I20a415edd05afd6d0b8f05171ea11c94e4f5cc57

9 years agoAdded generic signal binding for toolkit controls in JavaScript 50/51650/2
Richard Huang [Wed, 11 Nov 2015 17:30:50 +0000 (17:30 +0000)]
Added generic signal binding for toolkit controls in JavaScript

This should cover generic use cases where the signal callback only needs to
be aware of who emits the signal and do not need to return any parameter.

This will work for most of control signals without specific binding.

For example, for button, you can do:

  var button = new dali.Control("PushButton");
  button.name = "myButton";
  button.connect("pressed", app.onButtonPressed);
  button.connect("released", app.onButtonReleased);

  app.onButtonPressed = function( button ) {
    console.log(button.name + " Pressed!!!");
  }

  app.onButtonReleased = function( button ) {
    console.log(button.name + " Released!!!");
  }

  button.disconnect("pressed", app.onButtonPressed);
  button.disconnect("released", app.onButtonReleased);

Change-Id: I3144ca274cc07e68d81ba78cc606e5367ea5419b

9 years agoMerge "Remove unnamed namespace from DissolveEffect (Klocwork Error)" into devel...
Kimmo Hoikka [Wed, 11 Nov 2015 18:03:38 +0000 (10:03 -0800)]
Merge "Remove unnamed namespace from DissolveEffect (Klocwork Error)" into devel/master

9 years agoMerge "Fix overshoot issue - not to make an overshoot actor twice" into devel/master
Adeel Kazmi [Wed, 11 Nov 2015 17:24:18 +0000 (09:24 -0800)]
Merge "Fix overshoot issue - not to make an overshoot actor twice" into devel/master

9 years agoRemove unnamed namespace from DissolveEffect (Klocwork Error) 41/51641/2
Adeel Kazmi [Wed, 11 Nov 2015 15:35:47 +0000 (15:35 +0000)]
Remove unnamed namespace from DissolveEffect (Klocwork Error)

Change-Id: I750f4130f948728b748504441e570b35a23d6880

9 years agoMerge "Fix various Klocwork errors" into devel/master
Kimmo Hoikka [Wed, 11 Nov 2015 13:46:52 +0000 (05:46 -0800)]
Merge "Fix various Klocwork errors" into devel/master

9 years agoFix various Klocwork errors 35/51635/2
Adeel Kazmi [Wed, 11 Nov 2015 12:32:07 +0000 (12:32 +0000)]
Fix various Klocwork errors

Change-Id: I34c5e2b4471d9c22fe3596b7c5417371573d84eb

9 years agoTextureRect uniform not registered when multiple ImageViews created with the same... 27/51627/2
Richard Huang [Wed, 11 Nov 2015 10:50:34 +0000 (10:50 +0000)]
TextureRect uniform not registered when multiple ImageViews created with the same url before on stage

Change-Id: If42a80e0510965d1040cf229ad07d751fe3d8490

9 years agoFix overshoot issue - not to make an overshoot actor twice 51/49951/2
Heeyong Song [Wed, 21 Oct 2015 08:32:52 +0000 (17:32 +0900)]
Fix overshoot issue - not to make an overshoot actor twice

Change-Id: Ia4228a1842ff499566f2d2f02dfcce5297804979

9 years agoFix for checkbox tick not animating on gradually 70/51570/2
Tom Robinson [Tue, 10 Nov 2015 17:01:54 +0000 (17:01 +0000)]
Fix for checkbox tick not animating on gradually

Change-Id: I3c9fa6f9508b6f7331d826b6d401a14fb8647239

9 years ago(Automated Tests) Changes required after removal of time getters from PlatformAbstraction 30/51430/3
Adeel Kazmi [Mon, 9 Nov 2015 12:34:53 +0000 (12:34 +0000)]
(Automated Tests) Changes required after removal of time getters from PlatformAbstraction

Change-Id: I13aad80d074e71edfafb4e184c8ef1ab4c423a06

9 years agoMerge "Automatic image atlasing" into devel/master
Kimmo Hoikka [Mon, 9 Nov 2015 16:37:02 +0000 (08:37 -0800)]
Merge "Automatic image atlasing" into devel/master

9 years agoAutomatic image atlasing 31/49931/33
Xiangyin Ma [Wed, 21 Oct 2015 15:52:35 +0000 (16:52 +0100)]
Automatic image atlasing

Change-Id: Iccff3a5aad466a696211b95f29d1411009cbf102

9 years agoFixed KeyboardFocusManager::ClearFocus is called twice on focus loss 39/50939/5
Tom Robinson [Tue, 3 Nov 2015 16:29:26 +0000 (16:29 +0000)]
Fixed KeyboardFocusManager::ClearFocus is called twice on focus loss

Change-Id: I65e456dcea2011a4bdfe4db2afe8cc072107e50e

9 years agoMerge "Fixed bug when delete first row in the tableView" into devel/master
Kimmo Hoikka [Fri, 6 Nov 2015 14:27:50 +0000 (06:27 -0800)]
Merge "Fixed bug when delete first row in the tableView" into devel/master

9 years agoMerge "(Automated Tests) Update test suite after changes to PlatformAbstraction"...
Kimmo Hoikka [Fri, 6 Nov 2015 13:58:54 +0000 (05:58 -0800)]
Merge "(Automated Tests) Update test suite after changes to PlatformAbstraction" into devel/master

9 years ago[dali_1.1.9] Merge branch 'devel/master' 12/51312/1
Tom Robinson [Fri, 6 Nov 2015 10:37:27 +0000 (10:37 +0000)]
[dali_1.1.9] Merge branch 'devel/master'

Change-Id: I59cf98353420d104c433ea372c704152ab56feef

9 years agoDALi Version 1.1.9 08/51308/1 dali_1.1.9
Tom Robinson [Fri, 6 Nov 2015 10:37:05 +0000 (10:37 +0000)]
DALi Version 1.1.9

Change-Id: I210baf579edf9d0c067debef5b48f5e4dc11eb46

9 years ago(Automated Tests) Update test suite after changes to PlatformAbstraction 46/51246/1
Adeel Kazmi [Thu, 5 Nov 2015 16:58:53 +0000 (16:58 +0000)]
(Automated Tests) Update test suite after changes to PlatformAbstraction

Change-Id: I39d9eb81195f9326e15a4bcee48b4609cc249186

9 years agoAllow to extract string value from a property with type of property map in JavaScript 25/51225/2
Richard Huang [Thu, 5 Nov 2015 11:11:30 +0000 (11:11 +0000)]
Allow to extract string value from a property with type of property map in JavaScript

Change-Id: I6a59cb84c9c105a0692d1492a7e34f80946b988e

9 years agoFixed RendererFactory::ResetRenderer not working correctly when actor is already... 29/50929/6
Chu Hoang [Tue, 3 Nov 2015 13:56:12 +0000 (13:56 +0000)]
Fixed RendererFactory::ResetRenderer not working correctly when actor is already on stage.

Change-Id: Idbb0afabd09213f04b9cf95a4d7a83cc66d45ddd
RendererFactory::ResetRenderer( Toolkit::ControlRenderer&, Actor&, const Property::Map& ) did not add the renderer to the actor if the actor was already on stage but without a previous control renderer attached.

9 years agoSupport to extract values from property map within property map in JavaScript binding 12/51012/2
Richard Huang [Wed, 4 Nov 2015 11:30:38 +0000 (11:30 +0000)]
Support to extract values from property map within property map in JavaScript binding

Change-Id: I70832fdff8b72bea73e200e88ff751d87b756234

9 years agoMerge "Changed all property & signal names to lowerCamelCase" into devel/master
Kimmo Hoikka [Wed, 4 Nov 2015 11:18:37 +0000 (03:18 -0800)]
Merge "Changed all property & signal names to lowerCamelCase" into devel/master

9 years agoChanged all property & signal names to lowerCamelCase 35/50835/7
Adeel Kazmi [Mon, 2 Nov 2015 18:15:39 +0000 (18:15 +0000)]
Changed all property & signal names to lowerCamelCase

e.g. anchor-point-x --> anchorPointX

Change-Id: Ieac0ff1c4f2fee7f3121cd8bed03e60a554e4781

9 years agoFixed ItemView flicking to top now shows overshoot indicator 07/50107/2
Tom Robinson [Fri, 23 Oct 2015 13:26:57 +0000 (14:26 +0100)]
Fixed ItemView flicking to top now shows overshoot indicator

Change-Id: I4d4e2b2ae51db8b74d76d729842011846cd84114

9 years agoFixed bug when delete first row in the tableView 78/50778/1
suhyung Eom [Mon, 2 Nov 2015 06:42:11 +0000 (15:42 +0900)]
Fixed bug when delete first row in the tableView

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Icab6a391119c35d2e7a56c3ce397927b4b84d2f5

9 years agoRemove SetTextureAffectsTransparency as it is not needed 40/50740/3
Kimmo Hoikka [Fri, 30 Oct 2015 11:56:12 +0000 (11:56 +0000)]
Remove SetTextureAffectsTransparency as it is not needed

Change-Id: Idff1a07f187ab36df69ec541d5ff7c2aa6b1d420

9 years agoMerge "Fix Kloc issues." into devel/master
Adeel Kazmi [Thu, 29 Oct 2015 11:38:26 +0000 (04:38 -0700)]
Merge "Fix Kloc issues." into devel/master

9 years agoFix Kloc issues. 22/50522/1
Victor Cebollada [Thu, 29 Oct 2015 10:58:17 +0000 (10:58 +0000)]
Fix Kloc issues.

Change-Id: I339d9a45ebe0db37d885bd658ade44035586a9e5
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
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