platform/core/uifw/dali-toolkit.git
9 years agoMerge "Fix VD prevent issues" into devel/master
Adeel Kazmi [Fri, 28 Aug 2015 16:48:45 +0000 (09:48 -0700)]
Merge "Fix VD prevent issues" into devel/master

9 years agoBasic pan-gesture resampling for when prediction is off 87/46987/2
Tom Robinson [Thu, 27 Aug 2015 15:03:41 +0000 (16:03 +0100)]
Basic pan-gesture resampling for when prediction is off

Change-Id: I29a8461dfa803252a51dfd9a95e4b4a0e3660f38
Signed-off-by: Tom Robinson <tom.robinson@samsung.com>
9 years agoMerge "Fixes some alignment issues." into devel/master
Adeel Kazmi [Fri, 28 Aug 2015 11:51:01 +0000 (04:51 -0700)]
Merge "Fixes some alignment issues." into devel/master

9 years agoMerge "System font family change to update font in TextField" into devel/master
Adeel Kazmi [Fri, 28 Aug 2015 11:50:35 +0000 (04:50 -0700)]
Merge "System font family change to update font in TextField" into devel/master

9 years agoFix VD prevent issues 03/46803/2
Heeyong Song [Wed, 26 Aug 2015 08:15:08 +0000 (17:15 +0900)]
Fix VD prevent issues

1. rand -> rand_r: thread unsafe
2. copy constructor and asignment operator are missed

Change-Id: I505a831eb729255b240327d08b7c436378d75aab

9 years agoSystem font family change to update font in TextField 57/46757/3
Agnelo Vaz [Tue, 25 Aug 2015 15:56:11 +0000 (16:56 +0100)]
System font family change to update font in TextField

* StyleManager has an API to GetDefaultFontFamily
* StyleManager to store DefaultFontFamly from StyleMonitor when system font changes.
* TextField to Update Text Model after Default font changes.

- Currently editing text changes but not the Inactive Placeholder

Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Change-Id: I6d3f070e7ec57fea9815348ddce998563b392a95

9 years agoShows the virtual keyboard when text-field receives a long-press. 35/46935/3
v.cebollada [Thu, 27 Aug 2015 08:42:03 +0000 (17:42 +0900)]
Shows the virtual keyboard when text-field receives a long-press.

Change-Id: I7854dc1489d5829894ed4cec35a7982c8da9c315
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoFixes some alignment issues. 13/46913/1
v.cebollada [Thu, 27 Aug 2015 07:19:25 +0000 (16:19 +0900)]
Fixes some alignment issues.

* Align decorator when text-field's size changes.
* Fixes the text's scroll position when the text-field's size changes.

Change-Id: Iede1a116b6855da47a689e4da7e70775e13ed821
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoScaling feature for fixed-size fonts 63/46663/10
Paul Wisbey [Mon, 24 Aug 2015 13:59:50 +0000 (14:59 +0100)]
Scaling feature for fixed-size fonts

Change-Id: If882e9ceee65e657b47fe5e54534975f684d20b8

9 years agoMerge "Do not re-position the text popup when the text scrolls." into devel/master
Paul Wisbey [Wed, 26 Aug 2015 14:53:39 +0000 (07:53 -0700)]
Merge "Do not re-position the text popup when the text scrolls." into devel/master

9 years agoMerge "(ScrollView)Fix the double bouncing of the overshoot actor" into devel/master
Kimmo Hoikka [Wed, 26 Aug 2015 11:41:02 +0000 (04:41 -0700)]
Merge "(ScrollView)Fix the double bouncing of the overshoot actor" into devel/master

9 years agoDALi Version 1.1.1 19/46819/1 dali_1.1.1
Lee Morgan [Wed, 26 Aug 2015 10:14:45 +0000 (11:14 +0100)]
DALi Version 1.1.1

Change-Id: Ia463cd2c33e6f41bc4d159ab449e7caeb1ab405b

9 years agoDo not re-position the text popup when the text scrolls. 29/46729/7
v.cebollada [Tue, 25 Aug 2015 10:16:11 +0000 (19:16 +0900)]
Do not re-position the text popup when the text scrolls.

Change-Id: Idaa6be6547e8c9a96f603d6ab2efa997747dea8c
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years ago(ScrollView)Fix the double bouncing of the overshoot actor 54/46754/2
Xiangyin Ma [Tue, 25 Aug 2015 14:51:24 +0000 (15:51 +0100)]
(ScrollView)Fix the double bouncing of the overshoot actor

Remove ClearOvershoot, as the overshoot actor is updated with the change of OVERSHOOT_X / OVERSHOOT_Y through property noticification,
the clear animation is redundant which causes the double bouncing

Change-Id: I3a377928f1e18ded3a87882dd57b7e9e9ffeea51

9 years agoMerge "Fixes the change of style when the text-field grabs the keyboard focus." into...
Paul Wisbey [Tue, 25 Aug 2015 09:11:11 +0000 (02:11 -0700)]
Merge "Fixes the change of style when the text-field grabs the keyboard focus." into devel/master

9 years agoMerge "PageTurnView cleanup" into devel/master
Kimmo Hoikka [Mon, 24 Aug 2015 14:06:10 +0000 (07:06 -0700)]
Merge "PageTurnView cleanup" into devel/master

9 years agoChanged the cursor behavior to match other solutions 67/46567/2
Paul Wisbey [Fri, 21 Aug 2015 15:31:22 +0000 (16:31 +0100)]
Changed the cursor behavior to match other solutions

1) When the TextField is empty, repeatedly tapping should not affect the cursor blinking
2) When entering/deleting text, the cursor should not be blinking
3) When moving the cursor position, the cursor should not be blinking

Change-Id: Ib6dac81683edc7d54b3e96dbd47d7ce83c849c25

9 years agoFixes the change of style when the text-field grabs the keyboard focus. 06/46606/1
v.cebollada [Mon, 24 Aug 2015 04:48:53 +0000 (13:48 +0900)]
Fixes the change of style when the text-field grabs the keyboard focus.

* The text field is not in edit mode.
  - Double tap to select a word. The text-field grabs the focus but it
  shouldn't change to edit mode, it should select the word.
  - Tap to edit, tap in a different place to make the grab handle to appear.
  When the text-field grabs the focus it goes bak to edit mode and the
  grab handle dissapears.

Change-Id: I9dd055df25a8d358b0950faa76ab155affcce7cb
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoPageTurnView cleanup 36/45836/7
Xiangyin Ma [Tue, 11 Aug 2015 15:24:17 +0000 (16:24 +0100)]
PageTurnView cleanup

Change-Id: Ib6e198b14699da4d7f3bc8fcc6aa772012028d85

9 years agoMerge "Underline predictive text after updating the model." into devel/master
Paul Wisbey [Fri, 21 Aug 2015 10:43:00 +0000 (03:43 -0700)]
Merge "Underline predictive text after updating the model." into devel/master

9 years agoUnderline predictive text after updating the model. 40/46440/3
v.cebollada [Thu, 20 Aug 2015 08:40:40 +0000 (17:40 +0900)]
Underline predictive text after updating the model.

Change-Id: I0d3c11c1cccf971a5b9b25b85e271eb56beea345
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoFindSelectionIndices fixed if hit past the last character 71/46471/2
Agnelo Vaz [Thu, 20 Aug 2015 17:36:16 +0000 (18:36 +0100)]
FindSelectionIndices fixed if hit past the last character

* If tapping when a single character or tapping past the last character the target would not be selected.

Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Change-Id: If46f39de271f689cfff23d9cac7c99d0044437e9

9 years agoMerge "Fixed cursor behavior when no text is set" into devel/master
Paul Wisbey [Thu, 20 Aug 2015 16:38:36 +0000 (09:38 -0700)]
Merge "Fixed cursor behavior when no text is set" into devel/master

9 years agoFix to light animation in model3d-view control 67/46467/2
David Fumanal [Thu, 20 Aug 2015 15:15:13 +0000 (16:15 +0100)]
Fix to light animation in model3d-view control

Change-Id: Icbe7901c4096cad896f0040472ac7a9522348597

9 years agoMerge "Fixes cursor status when editing with popup or grab handle." into devel/master
Paul Wisbey [Thu, 20 Aug 2015 15:09:53 +0000 (08:09 -0700)]
Merge "Fixes cursor status when editing with popup or grab handle." into devel/master

9 years agoFixed cursor behavior when no text is set 64/46464/2
Paul Wisbey [Thu, 20 Aug 2015 14:22:26 +0000 (15:22 +0100)]
Fixed cursor behavior when no text is set

Change-Id: Ic794e633b284c1257126343ac6c0f6ec615868da

9 years agoSwitch off logging for Text Controller 65/46465/1
Agnelo Vaz [Thu, 20 Aug 2015 14:09:44 +0000 (15:09 +0100)]
Switch off logging for Text Controller

Change-Id: I961a04365e2001a2edc2a87c2dfb9a97035c998e
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "Ensure cursor positioned at end of selection when focus restored" into devel...
Paul Wisbey [Thu, 20 Aug 2015 13:50:04 +0000 (06:50 -0700)]
Merge "Ensure cursor positioned at end of selection when focus restored" into devel/master

9 years agoMerge "Fix for underlined text." into devel/master
Adeel Kazmi [Thu, 20 Aug 2015 13:22:12 +0000 (06:22 -0700)]
Merge "Fix for underlined text." into devel/master

9 years agoMerge "Fix when deleting with predictive text enabled." into devel/master
Adeel Kazmi [Thu, 20 Aug 2015 13:10:07 +0000 (06:10 -0700)]
Merge "Fix when deleting with predictive text enabled." into devel/master

9 years agoMerge "Fix for cursor position when a void text is set." into devel/master
Adeel Kazmi [Thu, 20 Aug 2015 13:09:53 +0000 (06:09 -0700)]
Merge "Fix for cursor position when a void text is set." into devel/master

9 years agoMerge "Fix for predictive text." into devel/master
Adeel Kazmi [Thu, 20 Aug 2015 13:09:43 +0000 (06:09 -0700)]
Merge "Fix for predictive text." into devel/master

9 years agoEnsure cursor positioned at end of selection when focus restored 72/45972/3
Agnelo Vaz [Wed, 12 Aug 2015 14:59:55 +0000 (15:59 +0100)]
Ensure cursor positioned at end of selection when focus restored

* If KeyInputFocus is lost during selection then the cursor should be positioned at end of the selection when Focus regained.
* Behaviour set to match other systems

Change-Id: I51fb52df99f6a8131c2f74acf54651667567f62f
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoDALi Version 1.1.0 54/46454/1 dali_1.1.0
Chu Hoang [Thu, 20 Aug 2015 12:33:13 +0000 (13:33 +0100)]
DALi Version 1.1.0

Change-Id: I802e13f298587626edc579641405538bb7ed7d3d

9 years agoFix for predictive text. 29/46329/4
taeyoon0.lee [Tue, 18 Aug 2015 13:17:31 +0000 (22:17 +0900)]
Fix for predictive text.

* With Latin upper case characters a key event with key code 50
  is sent. Then the pre-edit flag was cleared.
  Now this key event is ignored but the text controller doesn't
  know how to handle this event correctly.

Change-Id: I7bdb9cd41056d18240789bd17cc5826c71a779f5
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoFixes cursor status when editing with popup or grab handle. 96/46396/1
v.cebollada [Thu, 20 Aug 2015 05:17:06 +0000 (14:17 +0900)]
Fixes cursor status when editing with popup or grab handle.

Change-Id: I5e0f3066f77fca07e7a42d9bfaf9fda9d0f824aa
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoFix for underlined text. 77/46377/1
v.cebollada [Wed, 19 Aug 2015 15:19:18 +0000 (00:19 +0900)]
Fix for underlined text.

* Avoids the crash the first time a forled name is edited.

Change-Id: I378b04143afbed98d40284450bf31748efd07a96
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoFix when deleting with predictive text enabled. 27/46327/1
v.cebollada [Wed, 19 Aug 2015 08:09:00 +0000 (17:09 +0900)]
Fix when deleting with predictive text enabled.

* Clears the unwanted characters.
* Fixes the cursor position.

Change-Id: Ief7973d8ba80b5d4de3d93baa452a7cb8363693a
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoFix for cursor position when a void text is set. 05/46305/1
v.cebollada [Wed, 19 Aug 2015 04:51:44 +0000 (13:51 +0900)]
Fix for cursor position when a void text is set.

Change-Id: Iffc48de856e923567d07def0dd7feac2cf733092
Signed-off-by: v.cebollada <v.cebollada@samsung.com>
9 years agoMerge "(AutomatedTests) Updates to test-platform-abstraction after adding DecodeBuffe...
Kimmo Hoikka [Fri, 14 Aug 2015 16:42:42 +0000 (09:42 -0700)]
Merge "(AutomatedTests) Updates to test-platform-abstraction after adding DecodeBuffer" into devel/master

9 years ago(AutomatedTests) Updates to test-platform-abstraction after adding DecodeBuffer 94/46094/2
Adeel Kazmi [Fri, 14 Aug 2015 15:39:02 +0000 (16:39 +0100)]
(AutomatedTests) Updates to test-platform-abstraction after adding DecodeBuffer

Change-Id: Ib7fb833c615a4a2059f3427ff2c7945bec5a0412

9 years agoFix memory leak caused by the handle of scrollable object stored in ScrollBar 74/44674/6
Richard Huang [Fri, 24 Jul 2015 13:14:53 +0000 (14:14 +0100)]
Fix memory leak caused by the handle of scrollable object stored in ScrollBar

Change-Id: Idd12ce47c9c961e67d30563a8e55a13930e6cd61

9 years agoTextField and TextLabel not to ApplyStyle if Font size or family already set 73/46073/2
Agnelo Vaz [Thu, 13 Aug 2015 17:10:28 +0000 (18:10 +0100)]
TextField and TextLabel not to ApplyStyle if Font size or family already set

* If the Font Point size or Font family has been set then will not ApplyStyle after notifcation from StyleMonitor
* If StyleMonitor requests a ThemeChange then the new theme will be applied and over-ride set properties

- If the system font point size is changed this will not take effect until application restarted.
- Font Point Size or Font family can not be changed by system instantly

Change-Id: Ib3fd88c3def9f8af63aaca9556192043a2274e48
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "New control to load OBJ files" into devel/master
Paul Wisbey [Fri, 14 Aug 2015 09:03:37 +0000 (02:03 -0700)]
Merge "New control to load OBJ files" into devel/master

9 years agoMerge "Changes after timeDelta parameter removed from PostRender" into devel/master
Kimmo Hoikka [Thu, 13 Aug 2015 18:43:01 +0000 (11:43 -0700)]
Merge "Changes after timeDelta parameter removed from PostRender" into devel/master

9 years agoFix for crash when an atlas can only contain a single glyph. 60/46060/2
Richard Underhill [Thu, 13 Aug 2015 11:58:58 +0000 (12:58 +0100)]
Fix for crash when an atlas can only contain a single glyph.

Change-Id: I968d11d1eeffe219f973e57989a049c1e2a05b64
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoChanges after timeDelta parameter removed from PostRender 85/45085/4
Adeel Kazmi [Fri, 31 Jul 2015 09:20:52 +0000 (10:20 +0100)]
Changes after timeDelta parameter removed from PostRender

Change-Id: Ife68a646bcd105439e3f2eecd2ce6e6bdf473ec1

9 years agoMerge "Fix cursor's position when there is no text and the width is > 1." into devel...
Paul Wisbey [Thu, 13 Aug 2015 13:24:28 +0000 (06:24 -0700)]
Merge "Fix cursor's position when there is no text and the width is > 1." into devel/master

9 years agoAdding "Light" font-style to ToolbarPopup json style sheets 76/45976/2
Agnelo Vaz [Wed, 12 Aug 2015 17:15:25 +0000 (18:15 +0100)]
Adding "Light" font-style to ToolbarPopup json style sheets

Change-Id: I23aebdd4bf17f3dc8f2f9b8b81fa3db4fc483663
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFix cursor's position when there is no text and the width is > 1. 17/46017/1
Victor Cebollada [Thu, 13 Aug 2015 08:38:03 +0000 (09:38 +0100)]
Fix cursor's position when there is no text and the width is > 1.

Change-Id: I03fa21885b874624c1414656f51f1b5bcaacf650
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoNew control to load OBJ files 88/44288/19
David Fumanal [Mon, 20 Jul 2015 13:33:50 +0000 (14:33 +0100)]
New control to load OBJ files

Change-Id: I349f36808c8d2f521adab2a280167643e8d2206f

9 years agoDALi Version 1.0.53 17/45917/1 dali_1.0.53
Adeel Kazmi [Wed, 12 Aug 2015 09:50:46 +0000 (10:50 +0100)]
DALi Version 1.0.53

Change-Id: I30e21bdb9cdbe9bb2950e6d4ef8b06f492d7e1c7

9 years agoMerge "Use OVERLAY_2D for scroll overshoot etc." into devel/master
Kimmo Hoikka [Tue, 11 Aug 2015 13:48:55 +0000 (06:48 -0700)]
Merge "Use OVERLAY_2D for scroll overshoot etc." into devel/master

9 years agoMerge "Add a cursor's width property." into devel/master
Paul Wisbey [Tue, 11 Aug 2015 12:31:58 +0000 (05:31 -0700)]
Merge "Add a cursor's width property." into devel/master

9 years agoUse OVERLAY_2D for scroll overshoot etc. 13/45813/2
Paul Wisbey [Tue, 11 Aug 2015 12:24:32 +0000 (13:24 +0100)]
Use OVERLAY_2D for scroll overshoot etc.

Change-Id: I6d2461e5377ab467390eeed74c2122047640b513

9 years agoMerge "Internal UTC tests for popup with backing color fix" into devel/master
Adeel Kazmi [Mon, 10 Aug 2015 15:49:22 +0000 (08:49 -0700)]
Merge "Internal UTC tests for popup with backing color fix" into devel/master

9 years agoAdd a cursor's width property. 82/45682/1
Victor Cebollada [Mon, 10 Aug 2015 09:18:34 +0000 (10:18 +0100)]
Add a cursor's width property.

Change-Id: I8bb4f335149f79fff615e056b28b95a8d91da3ce
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoInternal UTC tests for popup with backing color fix 89/45589/1
Tom Robinson [Fri, 7 Aug 2015 15:06:42 +0000 (16:06 +0100)]
Internal UTC tests for popup with backing color fix

Change-Id: Ib12bc662e4fa8390a11b337b96fb337437cc690f

9 years agoAdding Selection Markers to TextField 86/45486/5
Agnelo Vaz [Wed, 5 Aug 2015 09:36:48 +0000 (10:36 +0100)]
Adding Selection Markers to TextField

* Selection Markers if specified in json style file whill add a upper left image and upper right image to the selection handle.
 They can be on the same level as the text and stretch to it's height.

* Image Handle Properties for decorations changed from string to Map as string did not work. Control used MAP for background-image.

* Updated TCT cases for testing Handle Images

Change-Id: I2df31baa4a1c6fe5a34b437532c46393b4d6aee3
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoButton Label properties can now be set via Property::Map 00/45400/13
Tom Robinson [Wed, 5 Aug 2015 14:29:20 +0000 (15:29 +0100)]
Button Label properties can now be set via Property::Map

Change-Id: I3f3388125c39eaa6d6279a4f084042e863fff439

9 years agoFix for multilanguage support. 79/45479/3
Victor Cebollada [Thu, 6 Aug 2015 10:45:20 +0000 (11:45 +0100)]
Fix for multilanguage support.

* Add characters with unknown script like 0xffdf to the unknown script run.

Change-Id: I1ef1c1f3b1fa203647c3458e22a72d3d93fe23b5
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoDALi Version 1.0.52 68/45468/1 dali_1.0.52
Xiangyin Ma [Thu, 6 Aug 2015 10:05:38 +0000 (11:05 +0100)]
DALi Version 1.0.52

Change-Id: I584f9d383efa83f0c12e9f865606ed86bb08f32e

9 years agoMerge "New Popup implementation" into devel/master
Adeel Kazmi [Wed, 5 Aug 2015 15:35:55 +0000 (08:35 -0700)]
Merge "New Popup implementation" into devel/master

9 years agoNew Popup implementation 32/44832/14
Tom Robinson [Mon, 27 Jul 2015 16:15:45 +0000 (17:15 +0100)]
New Popup implementation

Change-Id: Id57b2824d26aa863454e428f5cc67a6128e1cfc1

9 years agoStyle Sheets updated with new cursor colour 76/45376/3
Agnelo Vaz [Wed, 5 Aug 2015 09:48:58 +0000 (10:48 +0100)]
Style Sheets updated with new cursor colour

Change-Id: Ibbe4372ad2f596ea8820f8adc1a45246a97c1190
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFix for highlight box and handles. 60/45360/2
Victor Cebollada [Wed, 5 Aug 2015 07:04:36 +0000 (08:04 +0100)]
Fix for highlight box and handles.

* Fixed the position to take account of the text alignment.

Change-Id: I2e18c3420f6412942124a9da9af3feb1b78ae13d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Fixed some TextField logging macros" into devel/master
Paul Wisbey [Tue, 4 Aug 2015 16:22:58 +0000 (09:22 -0700)]
Merge "Fixed some TextField logging macros" into devel/master

9 years agoMerge "Stop CreateSolidActor from creating an RGBA BufferImage when it isn't needed...
Paul Wisbey [Tue, 4 Aug 2015 15:18:21 +0000 (08:18 -0700)]
Merge "Stop CreateSolidActor from creating an RGBA BufferImage when it isn't needed" into devel/master

9 years agoFixed some TextField logging macros 18/45318/2
Paul Wisbey [Tue, 4 Aug 2015 14:20:57 +0000 (15:20 +0100)]
Fixed some TextField logging macros

Change-Id: I046156756437cb6fbb31bb4b6fcd122c2a3709cf

9 years agoText Selection Popup Fade-in/Fade-out animation 40/45040/8
Agnelo Vaz [Thu, 30 Jul 2015 17:44:43 +0000 (18:44 +0100)]
Text Selection Popup Fade-in/Fade-out animation

* Popup creation refactor to keep track of enabled buttons during animation show/hides and prevent reconstruction when Relayout occurs but not change in Popup.
* popup-fade-in-duration Property added.
* Popup fades from 0 to 100 opacity
* 2.4 Core_VI-qHD_REF State Toast opacity duration is 250md from 0-100. Popup follows Toast guideline.
* Toolbar Property Name fix

- Toolbar not getting MAX_SIZE from json file so TextSelectionPopup is storing max size and applying to Toolbar

Change-Id: Ied0972b8c809b7a3c9dcda2dd77ae2ca35c89382
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoStop CreateSolidActor from creating an RGBA BufferImage when it isn't needed 18/45218/3
Ferran Sole [Mon, 3 Aug 2015 14:49:38 +0000 (15:49 +0100)]
Stop CreateSolidActor from creating an RGBA BufferImage when it isn't needed

Changed CreateSolidActor so it will create an RGBA texture if color or border color has alpha channel
or an RGB texture otherwise

Change-Id: Ic1901a8805ceac4a84ddbbb94128abc43097ffa9

9 years agoAdded getNaturalSize, getWidthForHeight, getHeightForWidth JS API's 58/45158/2
Nick Holland [Mon, 3 Aug 2015 06:52:45 +0000 (07:52 +0100)]
Added getNaturalSize, getWidthForHeight, getHeightForWidth JS API's

Change-Id: I8056dedb24bf9cb27dc3d824ef752a1f67d9ccf0

9 years agoDrop Shadow fix after changes in render ordering. 38/45038/2
Richard Underhill [Fri, 31 Jul 2015 14:54:01 +0000 (15:54 +0100)]
Drop Shadow fix after changes in render ordering.

Change-Id: I412dd2265ca1e02a78b54cac5e0cf1fa6077adbd
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Ability to build from different Style folders" into devel/master
Kimmo Hoikka [Fri, 31 Jul 2015 12:12:17 +0000 (05:12 -0700)]
Merge "Ability to build from different Style folders" into devel/master

9 years agoUpdate license information in the spec file 67/45067/1
Yoonsang Lee [Fri, 31 Jul 2015 05:53:06 +0000 (14:53 +0900)]
Update license information in the spec file

Change-Id: I46f9283f7060ba7e262f2eaaca620bc94d16082b

9 years agoAbility to build from different Style folders 35/44935/5
Agnelo Vaz [Wed, 29 Jul 2015 13:39:13 +0000 (14:39 +0100)]
Ability to build from different Style folders

* Added a "reference" folder which contains the default style
* Althernative folders can be added to the style folder
* Build system can be configured to use defined folder for style file.

- spec file currently only uses reference folder but will be configurable from build system in future

Change-Id: Ia24efc50112a03d0048d24665d0f5ce6b2b01c08

9 years agoUnderline predictive text. 73/44873/2
Victor Cebollada [Tue, 28 Jul 2015 08:43:37 +0000 (09:43 +0100)]
Underline predictive text.

Change-Id: I4675891596c6db239e4f58a5c372ad18fd4d2194
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoDALi Version 1.0.51 83/44983/1 dali_1.0.51
Tom Robinson [Thu, 30 Jul 2015 08:26:37 +0000 (09:26 +0100)]
DALi Version 1.0.51

Change-Id: Icf68fbadd385fcd3fe7ec5123b734888d958fbac

9 years agoStop memory leak in Text Controller. 38/44938/1
Richard Underhill [Wed, 29 Jul 2015 15:23:05 +0000 (16:23 +0100)]
Stop memory leak in Text Controller.

Change-Id: I85d397aded4dafc1fbf7211170d6b3ece5546c9f
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoCorrects Invalid Write (reported by valgrind ) in AtlasManager. 57/44857/2
Richard Underhill [Tue, 28 Jul 2015 12:16:15 +0000 (13:16 +0100)]
Corrects Invalid Write (reported by valgrind ) in AtlasManager.

Change-Id: I61ddeb16bca679b51c4e1a232e64f95070809374
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Stop setting crazy Z value with controls (at the moment depth is ignored by...
Adeel Kazmi [Tue, 28 Jul 2015 14:42:34 +0000 (07:42 -0700)]
Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by Size negotiation)" into devel/master

9 years agoMerge "Text clean." into devel/master
Paul Wisbey [Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)]
Merge "Text clean." into devel/master

9 years agoInitialize the line run direction when there is an ellipsis line. 59/44859/1
Victor Cebollada [Tue, 28 Jul 2015 12:34:27 +0000 (13:34 +0100)]
Initialize the line run direction when there is an ellipsis line.

Change-Id: I3c9705c29ed7bbaaf05307ab20cfec15493028e3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoText clean. 22/44422/6
Victor Cebollada [Tue, 21 Jul 2015 14:17:03 +0000 (15:17 +0100)]
Text clean.

* Removes includes.
* Moves code in text-view.cpp to match the .h

Change-Id: Ifc510f19a427722f6072122f68b5f26800dc1081
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoStop setting crazy Z value with controls (at the moment depth is ignored by Size... 89/44789/2
Kimmo Hoikka [Mon, 27 Jul 2015 16:21:47 +0000 (17:21 +0100)]
Stop setting crazy Z value with controls (at the moment depth is ignored by Size negotiation)

Change-Id: I0c192a4a00cc0d848ada0714021d5eacc22ba8e2

9 years agoStyle Manager to create ThemeBuilder before Applying Style 87/44787/1
Agnelo Vaz [Mon, 27 Jul 2015 16:14:31 +0000 (17:14 +0100)]
Style Manager to create ThemeBuilder before Applying Style

* Fix bug in which Control::Initialize tries to ApplyStyle but StyleManager does not create a theme builder unless SetStyleName called.

Change-Id: I34a1854a1a4b2c6e08fbbdb21dffa4b04055cfcc
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoKeep track of Bitmap data ownership 16/44616/4
Richard Underhill [Fri, 24 Jul 2015 10:45:22 +0000 (11:45 +0100)]
Keep track of Bitmap data ownership

Change-Id: I94cd806cd506d2375ce565f6caf997467b14e164
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoFix for Text coloring issues with multiple atlas use. 87/44687/3
Richard Underhill [Mon, 27 Jul 2015 10:04:18 +0000 (11:04 +0100)]
Fix for Text coloring issues with multiple atlas use.

Change-Id: If98fa55497f7b5eb53303fce45a1588fa141cf4f
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Button SetLabel padding fix" into devel/master
Kimmo Hoikka [Fri, 24 Jul 2015 15:10:34 +0000 (08:10 -0700)]
Merge "Button SetLabel padding fix" into devel/master

9 years agoMerge "Modify RadioButton test case" into devel/master
Kimmo Hoikka [Fri, 24 Jul 2015 15:10:24 +0000 (08:10 -0700)]
Merge "Modify RadioButton test case" into devel/master

9 years agoButton SetLabel padding fix 84/44684/2
Tom Robinson [Fri, 24 Jul 2015 13:58:25 +0000 (14:58 +0100)]
Button SetLabel padding fix

Change-Id: If9db6c7817811bb2d54edba9909db4e48dc3fd6f

9 years agoUpdate cursor when Keyboard Focus gained 73/44673/3
Agnelo Vaz [Fri, 24 Jul 2015 12:40:12 +0000 (13:40 +0100)]
Update cursor when Keyboard Focus gained

* Cursor had 0 height if TextField editmode started without tapping control

Change-Id: Iad6eeb1a4e6e55c498a1afc276acee03b10095d3
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoUTC test fix and Adaptors initialising accessibility correctly 02/44502/4
Tom Robinson [Wed, 22 Jul 2015 15:31:47 +0000 (16:31 +0100)]
UTC test fix and Adaptors initialising accessibility correctly

Change-Id: Ieb8c851356f2158ac23c3e724ab2a1b0a2b4b275

9 years agoDALi Version 1.0.50 83/44583/1 dali_1.0.50
Richard Huang [Thu, 23 Jul 2015 10:56:13 +0000 (11:56 +0100)]
DALi Version 1.0.50

Change-Id: I21286ad7a09b4fcdc3c68c9f9da734c8e3283683

9 years agoModify RadioButton test case 38/44538/1
Heeyong Song [Thu, 23 Jul 2015 05:46:12 +0000 (14:46 +0900)]
Modify RadioButton test case

The touch point is out of button area because RadioButton size is small in target test. So I changed the touch point.

Change-Id: I93f0769b81becdca717bc0541e77e603b538a7ca

9 years agoMerge "Changed ImageView to use a unit square mesh and instead to size the mesh in...
Kimmo Hoikka [Wed, 22 Jul 2015 14:15:15 +0000 (07:15 -0700)]
Merge "Changed ImageView to use a unit square mesh and instead to size the mesh in the shader to the actor size." into devel/master

9 years agoMerge "Multi-line layout." into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 12:59:07 +0000 (05:59 -0700)]
Merge "Multi-line layout." into devel/master

9 years agoAdded new property API to Button. Added Icon and color features. Deprecated old API 00/44400/3
Tom Robinson [Tue, 21 Jul 2015 11:46:39 +0000 (12:46 +0100)]
Added new property API to Button. Added Icon and color features. Deprecated old API

Change-Id: I9bcc9ed61c04f12465d058794260454aa9290834

9 years agoMerge "Add UTCs for public-api" into devel/master
Kimmo Hoikka [Tue, 21 Jul 2015 14:36:38 +0000 (07:36 -0700)]
Merge "Add UTCs for public-api" into devel/master

9 years agoRemoved #include devel-api from image-view.h public-api header. 17/44417/2
Chu Hoang [Tue, 21 Jul 2015 13:22:50 +0000 (14:22 +0100)]
Removed #include devel-api from image-view.h public-api header.

Change-Id: I8b20bdf6ed0bfac2101c12e8ead6376aabd38e7e