platform/core/uifw/dali-toolkit.git
9 years agoText Drop Shadow sorting fix 40/40440/1
Richard Underhill [Wed, 3 Jun 2015 16:23:43 +0000 (17:23 +0100)]
Text Drop Shadow sorting fix

Change-Id: If6cc42150d413ab0778fad37a58f348e4af42c3e
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Changed Toolkit shader effects to be a static function returning a Dali::Shade...
Adeel Kazmi [Wed, 3 Jun 2015 15:08:39 +0000 (08:08 -0700)]
Merge "Changed Toolkit shader effects to be a static function returning a Dali::ShaderEffect instead of inheriting directly from ShaderEffect" into devel/new_mesh

9 years agoFixes for removal of animatable property-buffer. 53/40253/1
Francisco Santos [Mon, 1 Jun 2015 13:39:00 +0000 (14:39 +0100)]
Fixes for removal of animatable property-buffer.

Change-Id: I39f666b25a278aee0586623ffca179b1c94f2432

9 years agoChanged Toolkit shader effects to be a static function returning a 53/39553/13
Ferran Sole [Mon, 18 May 2015 14:31:11 +0000 (15:31 +0100)]
Changed Toolkit shader effects to be a static function returning a
Dali::ShaderEffect instead of inheriting directly from ShaderEffect

Change-Id: Ie01b1ea7b9cc8caa72a14b27e08ebfc887551635

9 years agoMerge "update bouncing-effect-actor to use new mesh" into devel/new_mesh
Adeel Kazmi [Fri, 22 May 2015 13:17:05 +0000 (06:17 -0700)]
Merge "update bouncing-effect-actor to use new mesh" into devel/new_mesh

9 years agoupdate bubble-emitter to use new mesh 61/39561/6
Xiangyin Ma [Mon, 18 May 2015 17:59:52 +0000 (18:59 +0100)]
update bubble-emitter to use new mesh

Change-Id: I2a46b496e3c1f4938978416f518b1330e62fa328

9 years agoupdate bouncing-effect-actor to use new mesh 18/39418/4
Xiangyin Ma [Thu, 14 May 2015 15:26:29 +0000 (16:26 +0100)]
update bouncing-effect-actor to use new mesh

Change-Id: I176a19b711a0f64219592e76df601180865a6e72

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 99/39599/1
Francisco Santos [Tue, 19 May 2015 10:05:42 +0000 (11:05 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
dali-toolkit/internal/atlas-manager/atlas-manager.h
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/file.list
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/dali-toolkit-version.cpp
docs/content/main-page.h
docs/content/programming-guide/script-overview.h
packaging/dali-toolkit.spec

Change-Id: I672b8fe4c79dcabd9a3fe323ad55a1a368cc0b0e

9 years agoMerge "Fix for cursor. Avoid the jump of the grab handle when there is a mix of...
Paul Wisbey [Sun, 17 May 2015 10:54:34 +0000 (03:54 -0700)]
Merge "Fix for cursor.   Avoid the jump of the grab handle when there is a mix of rtl and ltr text." into tizen

9 years agoMove more public-api headers to devel-api. PART 2 90/39490/2
Nick Holland [Fri, 15 May 2015 14:41:33 +0000 (15:41 +0100)]
Move more public-api headers to devel-api. PART 2

Support for changes to dali-core header files

Change-Id: I8e66c9bcfdd314d9c1901f4d3fbb7d0411cb92b1

9 years agoFix for cursor. 08/39308/2
Victor Cebollada [Thu, 7 May 2015 15:06:33 +0000 (16:06 +0100)]
Fix for cursor.
  Avoid the jump of the grab handle when there is a mix of rtl and ltr text.

Change-Id: I04a72452ab2cd1d2289c669bbf19b653abbba042
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoAdded support for including headers from devel folder 05/39205/7
Nick Holland [Mon, 11 May 2015 13:57:11 +0000 (14:57 +0100)]
Added support for including headers from devel folder

Change-Id: I482ab3160fb783a4623e2abf3417ece9fabc7572

9 years agoMerge "Added PathConstrainer and LinearConstrainer support to builder" into tizen
Adeel Kazmi [Fri, 15 May 2015 09:22:04 +0000 (02:22 -0700)]
Merge "Added PathConstrainer and LinearConstrainer support to builder" into tizen

9 years agoAdded PathConstrainer and LinearConstrainer support to builder 45/38145/14
Ferran Sole [Mon, 13 Apr 2015 15:02:37 +0000 (16:02 +0100)]
Added PathConstrainer and LinearConstrainer support to builder

constrainers are defined like this

  "constrainers":
  {
    "constrainer0":
    {
      "type":"PathConstrainer",
      "points":[[100.0, 500.0, 0.0],[400.0, 500.0, 0.0]] ,
      "control-points":[[200.0, 100.0, 0.0],[300.0, 100.0, 0.0]],
      "forward":[1.0,0.0,0.0]
    },
    "constrainer1":
    {
      "type":"LinearConstrainer",
      "values":[0,400,200,0],
      "progress":[0.0,0.25,0.75,1.0]
    }
  }

And they can be applied or remove using signals like this:

  ...
  "signals":
  [
    {
      "name": "on-stage",
      "action": "applyConstraint",
      "constrainer": "constrainer0",
      "properties":
      [
        {
          "target":"targetActor",
          "targetProperty":"position",
          "source":"sourceActor",
          "sourceProperty":"position-y",
          "range":[-120.0,300.0]
        },
        {
          "target":"targetActor",
          "targetProperty":"orientation",
          "source":"sourceActor",
          "sourceProperty":"position-y",
          "range":[-120.0,300.0]
        }
      ]
    },

    ...
  {
    "name": "touched",
    "action": "removeConstraints",
    "constrainer": "constrainer0",
    "properties":
    [
      {
        "target":"targetActor"
      }
    ]
  }

Change-Id: I182c5ac2ad53f36fcb17bdcde6c47b9facf12bf0

9 years agoRemoved unused scroll-view effects 15/39415/4
Ferran Sole [Thu, 14 May 2015 13:43:06 +0000 (14:43 +0100)]
Removed unused scroll-view effects

Change-Id: Ie176262c8ee25c43674632d3802e442041696c77

9 years agoMerge "Added PropertyValue Array as a class" into tizen
Kimmo Hoikka [Thu, 14 May 2015 15:37:42 +0000 (08:37 -0700)]
Merge "Added PropertyValue Array as a class" into tizen

9 years agoAdded PropertyValue Array as a class 02/39402/3
Lee Morgan [Tue, 12 May 2015 14:42:52 +0000 (15:42 +0100)]
Added PropertyValue Array as a class

Change-Id: I84de3a7feee2f19a2464a07be25859faefc26059

9 years agoFix anchor animation in ItemView and disable anchoring by default 96/39396/2
Richard Huang [Thu, 14 May 2015 10:23:34 +0000 (11:23 +0100)]
Fix anchor animation in ItemView and disable anchoring by default

Change-Id: I948bd793a754b88e72545a8a7821bd5ddcced839

9 years agoRefactored Item Layouts 22/39222/8
Adeel Kazmi [Mon, 11 May 2015 17:15:27 +0000 (18:15 +0100)]
Refactored Item Layouts

 - Removed boost::function usage
 - DepthLayout, GridLayout & SpiralLayout removed from Public API
   - Added a helper API to create the default layouts using an ENUM
 - Reworked the constraints in each layout
 - Removed automatic animations between layouts (broken anyway)
 - Added future extension to ItemLayout

Change-Id: I3265f190eccd8396d689d6f74c5e70cc8905c744

9 years agoScrollBar refactoring 34/39034/20
Richard Huang [Thu, 7 May 2015 10:50:41 +0000 (11:50 +0100)]
ScrollBar refactoring

1. Removed ScrollComponent and ScrollConnector
2. Further cleaned up Scollable public API
3. Refactored ScrollBar control to accept scroll position properties from customized property sources
4. Changed scroll position properties in ScrollView from Vector3 to Vector2
5. Harmonized ScrollView and ItemView to support the same new ScrollBar control

For example, to add a vertical scroll bar to ScrollView:

mScrollBarVertical = ScrollBar::New(Toolkit::ScrollBar::Vertical);
mScrollBarVertical.SetParentOrigin(ParentOrigin::TOP_RIGHT);
mScrollBarVertical.SetAnchorPoint(AnchorPoint::TOP_RIGHT);
mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT);
mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH);
mScrollView.Add(mScrollBarVertical);

Change-Id: Icf61530a64585f3edc1fa33022877923414500f2

9 years agoMerge "Added scroll view page path effect. Allows creating new scroll view effects...
Adeel Kazmi [Wed, 13 May 2015 15:57:55 +0000 (08:57 -0700)]
Merge "Added scroll view page path effect. Allows creating new scroll view effects for pages on a scrollview using a path. Removed ScrollViewPageCubeEffect, ScrollViewPageCarouselEffect and ScrollViewPageSpiralEffect which can be easily implemented using new scrollview path effect." into tizen

9 years agoAdded scroll view page path effect. 87/38987/10
Ferran Sole [Wed, 6 May 2015 08:22:14 +0000 (09:22 +0100)]
Added scroll view page path effect.
Allows creating new scroll view effects for pages on a scrollview
using a path.
Removed ScrollViewPageCubeEffect, ScrollViewPageCarouselEffect and ScrollViewPageSpiralEffect
which can be easily implemented using new scrollview path effect.

Change-Id: Iabc4cef2dc810466def5b12846e451b46710ecb9

9 years agoText Layout - Ellipsis the text when exceeds the boundaries of the box. 66/39266/9
Victor Cebollada [Fri, 8 May 2015 09:38:30 +0000 (10:38 +0100)]
Text Layout - Ellipsis the text when exceeds the boundaries of the box.

Change-Id: I70d5be413e080bc75a0a9505736cc4170a1b69be
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoRemove use of ActorContainer 10/39310/3
Nick Holland [Tue, 12 May 2015 17:24:26 +0000 (18:24 +0100)]
Remove use of ActorContainer

Also removed some unnecessary includes of <vector-wrapper.h> from
public-api files

Change-Id: I226fc94568e73231ad52e7db52b12328688e8881

9 years agoPathConstrainer changes in JS Plugin + LinearConstrainer 64/38064/13
Ferran Sole [Fri, 10 Apr 2015 10:11:00 +0000 (11:11 +0100)]
PathConstrainer changes in JS Plugin + LinearConstrainer

Sample code showing how to use PathConstrainer in Javascript:

var pathConstrainer = new dali.PathConstrainer();
pathConstrainer.points = [ point0, point1, point2 ];
pathConstrainer.controlPoints = [ controlPoint0, controlPoint1, controlPoint2, controlPoint3 ];
pathConstrainer.forward = [1.0,0.0,0.0];

var constraintPosition = {
                          "target":actor,
                          "targetProperty":"position",
                          "source":actor,
                          "sourceProperty":"color-alpha",
                          "range":[0.0,1.0]
                         };

pathConstrainer.applyConstraint( constraintPosition );

Change-Id: If5c5aee0d402b5c689b983a9848648d6700dec6b

9 years agoMerge "Remove navigation frame control" into tizen
Adeel Kazmi [Tue, 12 May 2015 15:21:03 +0000 (08:21 -0700)]
Merge "Remove navigation frame control" into tizen

9 years agoMerge "Reduce ImageActor & RenderableActor APIs" into tizen
Kimmo Hoikka [Tue, 12 May 2015 15:14:25 +0000 (08:14 -0700)]
Merge "Reduce ImageActor & RenderableActor APIs" into tizen

9 years agoRemove navigation frame control 88/39288/2
Nick Holland [Tue, 12 May 2015 13:14:53 +0000 (14:14 +0100)]
Remove navigation frame control

Change-Id: Ice4b22f3153f2e4a4c7ae98debfa223cee9d8b1b

9 years agoRemove dependency to std::vector and property::value from property notification API 85/39285/1
Kimmo Hoikka [Tue, 12 May 2015 12:49:58 +0000 (13:49 +0100)]
Remove dependency to std::vector and property::value from property notification API

Change-Id: I606e7860fcc8c8ea1cc1cc38db2961b56a12870d

9 years agoReduce ImageActor & RenderableActor APIs 29/39229/1
Yoonsang Lee [Tue, 12 May 2015 01:07:14 +0000 (10:07 +0900)]
Reduce ImageActor & RenderableActor APIs

- Remove ImageActor::IsPixelAreaSet(), ClearPixelArea()
- Remove RenderableActor::SetBlendFunc(), SetBlendEquation(), GetBlendEquation(), SetBlendColor(), GetBlendColor()

Change-Id: I3d13dd7450338380197361ecae2859f0fec78988

9 years agoFix version issues with 1.0.41 19/39219/2
Adeel Kazmi [Mon, 11 May 2015 14:44:19 +0000 (15:44 +0100)]
Fix version issues with 1.0.41

Change-Id: If96da7e6d6e0d36db3f9f34a0cdb016217758fea

9 years agoAdded more shared C++/JavaScript documentation 98/38998/5
Nick Holland [Wed, 6 May 2015 10:59:48 +0000 (11:59 +0100)]
Added more shared C++/JavaScript documentation

TextLabel, script-hello, dali-fundamentals converted to markdown and
shared with JavaScript.
Removed all references to TextActor
Added JavaScript examples to JSON specification and moved to shared C++/
Javascript folder

Replaced main DALi screenshot image with screen grabs from current dali-demo

Change-Id: Iaf4b56c6a0e34356e8891e1b4cb3fbc1fdef0587

9 years agoMerge "IMF event fixes" into tizen
Kimmo Hoikka [Fri, 8 May 2015 15:08:18 +0000 (08:08 -0700)]
Merge "IMF event fixes" into tizen

9 years agoMerge "Revert "DALi Version 1.0.41"" into tizen
Paul Wisbey [Fri, 8 May 2015 14:30:50 +0000 (07:30 -0700)]
Merge "Revert "DALi Version 1.0.41"" into tizen

9 years agoRevert "DALi Version 1.0.41" 12/39112/1
Nick Holland [Fri, 8 May 2015 14:27:56 +0000 (07:27 -0700)]
Revert "DALi Version 1.0.41"

This reverts commit 541c8417421eec40c1bf6c7e2fca0e668b6369f3.

Change-Id: I4a6ae1a24bbbf722657fcdf3c6abb4d80a77a6f3

9 years agoMerge "DALi Version 1.0.41" into tizen
Paul Wisbey [Fri, 8 May 2015 14:17:18 +0000 (07:17 -0700)]
Merge "DALi Version 1.0.41" into tizen

9 years agoDALi Version 1.0.41 97/39097/1 accepted/tizen/common/20150512.125104 accepted/tizen/mobile/20150513.005616 accepted/tizen/tv/20150513.005251 accepted/tizen/wearable/20150513.005501 dali_1.0.41 submit/tizen/20150511.143422
Nick Holland [Fri, 8 May 2015 12:52:29 +0000 (13:52 +0100)]
DALi Version 1.0.41

Change-Id: Ia38edc3f527bad772130fa750f06eab405b039b1

9 years agoIMF event fixes 54/39054/7
Paul Wisbey [Thu, 7 May 2015 12:22:12 +0000 (13:22 +0100)]
IMF event fixes

Change-Id: Ide705ec18a46ded7fd770b20ce3752446e8c7f7d

9 years agoTextLayout - Wrap a word by character if it doesn't fit. 75/39075/1
Victor Cebollada [Fri, 8 May 2015 08:15:30 +0000 (09:15 +0100)]
TextLayout - Wrap a word by character if it doesn't fit.

Change-Id: I73c2005e0fab4ce538248ca0c428803096fce460
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoFixed JSON shaders. Added JSON spec to documentation 29/39029/1
Lee Morgan [Wed, 29 Apr 2015 14:05:16 +0000 (15:05 +0100)]
Fixed JSON shaders. Added JSON spec to documentation

Change-Id: Ia05409e49a9db7c944364bf50fb82cc5e700c37a

9 years agoSimplified the placeholder-text show/hide logic 09/39009/3
Paul Wisbey [Wed, 6 May 2015 15:50:17 +0000 (16:50 +0100)]
Simplified the placeholder-text show/hide logic

Change-Id: I4cd9e7befafcc78fd9f9cb6acdfdc6e79544e8e5

9 years agoCursor fix. 00/39000/1
Victor Cebollada [Wed, 6 May 2015 11:18:20 +0000 (12:18 +0100)]
Cursor fix.

Update the cursor position after all text is removed and
the place holder text appears.

Change-Id: I4455e5b382db195b5129cfd13c47c022811122c9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE - we don't...
HyunJu Shin [Wed, 6 May 2015 02:03:51 +0000 (19:03 -0700)]
Merge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE    - we don't need a padding in other resize policies." into tizen

9 years agoMerge "(ItemView) Store initial value in constraints to apply weight correctly" into...
Kimmo Hoikka [Tue, 5 May 2015 16:04:53 +0000 (09:04 -0700)]
Merge "(ItemView) Store initial value in constraints to apply weight correctly" into tizen

9 years agoMerge "Add more shared C++/JavaScript docs and add JavaScript wrapping guide" into...
Adeel Kazmi [Tue, 5 May 2015 15:45:45 +0000 (08:45 -0700)]
Merge "Add more shared C++/JavaScript docs and add JavaScript wrapping guide" into tizen

9 years agoMerge "More Text related logging & clean-up" into tizen
Adeel Kazmi [Tue, 5 May 2015 14:24:48 +0000 (07:24 -0700)]
Merge "More Text related logging & clean-up" into tizen

9 years agoAdd more shared C++/JavaScript docs and add JavaScript wrapping guide 90/37690/6
Nick Holland [Thu, 2 Apr 2015 11:54:08 +0000 (12:54 +0100)]
Add more shared C++/JavaScript docs and add JavaScript wrapping guide

Change-Id: Ief3c78e0b752b0c21e3dbebeb216317a154a440c

9 years agoMerge "Fix for multi-language support." into tizen
Paul Wisbey [Tue, 5 May 2015 12:32:14 +0000 (05:32 -0700)]
Merge "Fix for multi-language support." into tizen

9 years agoText Atlas Renderer Fixes 40/38940/4
Richard Underhill [Thu, 30 Apr 2015 17:25:05 +0000 (18:25 +0100)]
Text Atlas Renderer Fixes

Change-Id: Id427d2be2c3cdc110ad4fba2ef3125ced62f7eca
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoFix for multi-language support. 67/38967/1
Victor Cebollada [Tue, 5 May 2015 08:56:57 +0000 (09:56 +0100)]
Fix for multi-language support.

The validated font per script was not inserted in the chache producing a memory leak and also it was not reused.

Change-Id: Iee3bbbe96a36c65aafa12b92876e633a8af4174a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoSet label padding in case of ResizePolicy::USE_NATURAL_SIZE 63/38963/1
Heeyong Song [Mon, 4 May 2015 08:12:17 +0000 (17:12 +0900)]
Set label padding in case of ResizePolicy::USE_NATURAL_SIZE
   - we don't need a padding in other resize policies.

Change-Id: Icec860efd36a1115a9461ecb10a09a46c0a850fc

9 years agoMore Text related logging & clean-up 54/38954/8
Paul Wisbey [Sat, 2 May 2015 12:40:22 +0000 (13:40 +0100)]
More Text related logging & clean-up

Change-Id: If565d84d0543cdbc8e80c8c8a0f9e4ae16f2fe89

9 years agoFix for PLACEHOLDER_TEXT_FOCUSED feature 53/38953/3
Paul Wisbey [Sat, 2 May 2015 10:12:07 +0000 (11:12 +0100)]
Fix for PLACEHOLDER_TEXT_FOCUSED feature

Change-Id: Ifd2601e7f5d9a012d18af9b5279ade4782d9a164

9 years ago(ItemView) Store initial value in constraints to apply weight correctly 52/38952/1
Adeel Kazmi [Fri, 1 May 2015 16:52:03 +0000 (17:52 +0100)]
(ItemView) Store initial value in constraints to apply weight correctly

[Problem]  Constraint apply animations happen too quickly.
[Cause]    Interpolating between current and final value, but current is being updated.
[Solution] Store the initial value and interpolate between that and the desired value.

Change-Id: I71c6f403058f9ef0774fa1e42f4c0fbf6b7f29c2

9 years agoAdded more DALI_LOG_INFO for Text components 84/38884/13
Paul Wisbey [Wed, 29 Apr 2015 16:04:53 +0000 (17:04 +0100)]
Added more DALI_LOG_INFO for Text components

Enable Logging with environment variable
for general logging LOG_TEXT_CONTROLS=3,true
for verbose logging LOG_TEXT_CONTROLS=4,true

Change-Id: I58b02488875b6c72de28a9638d86dd68a0cb01dc

9 years agoFixes for latest merge and temporarily removed V8 support 39/38939/1
David Steele [Thu, 30 Apr 2015 16:43:47 +0000 (17:43 +0100)]
Fixes for latest merge and temporarily removed V8 support

Change-Id: I8769aa8eea9eeef236ab451235bcc2502b7997bc

9 years agoMerged with Tizen Branch ( builds ) 28/38928/2
Richard Underhill [Thu, 30 Apr 2015 12:40:38 +0000 (13:40 +0100)]
Merged with Tizen Branch ( builds )

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.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/builder/builder-animations.cpp
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.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/view/view-impl.cpp
dali-toolkit/internal/controls/view/view-impl.h
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/internal/text/rendering/atlas/text-atlas-renderer.h
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h
dali-toolkit/internal/text/rendering/text-renderer.h
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h
dali-toolkit/internal/text/visual-model-impl.cpp
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/view/view.h
dali-toolkit/public-api/dali-toolkit-version.cpp
docs/content/programming-guide/size-negotiation.h
packaging/dali-toolkit.spec

Change-Id: Ia6caabe5e4dc83995a0f10cd68a3a6487a1b7dba
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Added rectangle support for property values" into tizen
Adeel Kazmi [Thu, 30 Apr 2015 10:10:32 +0000 (03:10 -0700)]
Merge "Added rectangle support for property values" into tizen

9 years agoMerge "Fix unsigned/signed int comparison warning" into tizen
Adeel Kazmi [Wed, 29 Apr 2015 16:22:28 +0000 (09:22 -0700)]
Merge "Fix unsigned/signed int comparison warning" into tizen

9 years agoMerge "DALi Version 1.0.40" into tizen
Adeel Kazmi [Wed, 29 Apr 2015 16:20:34 +0000 (09:20 -0700)]
Merge "DALi Version 1.0.40" into tizen

9 years agoFix unsigned/signed int comparison warning 83/38883/1
Kingsley Stephens [Wed, 29 Apr 2015 15:53:56 +0000 (16:53 +0100)]
Fix unsigned/signed int comparison warning

Change-Id: I1ba59f93c7f842fad0a8a2a9b480e813be2c339a

9 years agoDALi Version 1.0.40 71/38871/1 dali_1.0.40
Lee Morgan [Wed, 29 Apr 2015 14:34:20 +0000 (15:34 +0100)]
DALi Version 1.0.40

Change-Id: I9bf818488d818c8beaff43afb6255a232a352599

9 years ago(Doxygen) Added constraints documentation & some clean up 58/38658/3
Adeel Kazmi [Thu, 23 Apr 2015 16:45:10 +0000 (17:45 +0100)]
(Doxygen) Added constraints documentation & some clean up

Change-Id: I226252305a1a2129c5fbe6691440a6422d54fb91

9 years agoAdded rectangle support for property values 71/37371/7
Nick Holland [Wed, 25 Mar 2015 09:40:00 +0000 (09:40 +0000)]
Added rectangle support for property values

layer.clippingBox = [ 2,54,56,4];
was failing

Change-Id: I5f438bbd24d169b5081a66635d14e459a5124e79

9 years agoPlaceholderText + IMF improvements 23/38723/12
Paul Wisbey [Sat, 25 Apr 2015 11:40:16 +0000 (12:40 +0100)]
PlaceholderText + IMF improvements

Change-Id: I14e33827fca8df01ac22699e59908f47c4341c2d

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 83/38783/1
Francisco Santos [Mon, 27 Apr 2015 16:11:28 +0000 (17:11 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-Cluster.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
automated-tests/src/dali-toolkit/utc-Dali-View.cpp
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.h
dali-toolkit/internal/controls/cluster/cluster-impl.cpp
dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
dali-toolkit/internal/controls/scrollable/scrollable-impl.h
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.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/controls/view/view-impl.cpp
dali-toolkit/internal/controls/view/view-impl.h
dali-toolkit/internal/file.list
dali-toolkit/internal/text/clipping/text-clipper.cpp
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/decorator/text-decorator.h
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
dali-toolkit/internal/text/text-control-interface.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h
dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
dali-toolkit/public-api/controls/buttons/push-button.cpp
dali-toolkit/public-api/controls/cluster/cluster-style.cpp
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
dali-toolkit/public-api/controls/text-controls/text-field.cpp
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/view/view.h
dali-toolkit/public-api/dali-toolkit-version.cpp
docs/content/programming-guide/animation-example.h
docs/content/programming-guide/animation-rotation.h
docs/content/programming-guide/dynamics-bodies.h
docs/content/programming-guide/size-negotiation.h
packaging/dali-toolkit.spec
plugins/dali-script-v8/src/object/property-value-wrapper.cpp

Change-Id: I5a0a9bc20a55ebcc9605c24d9ce1e688f0e6b9cc

9 years agoMerge "Alpha function changes" into tizen
Adeel Kazmi [Mon, 27 Apr 2015 09:21:18 +0000 (02:21 -0700)]
Merge "Alpha function changes" into tizen

9 years agoTextField to limit Input to maximum characters and emit signal 56/38656/10
Agnelo Vaz [Wed, 22 Apr 2015 15:58:46 +0000 (16:58 +0100)]
TextField to limit Input to maximum characters and emit signal

Change-Id: I592740c84c1121b2e5c9d3f779b4639236fa4ea6
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoSelection Handled Scrolling - Step1 94/38694/6
Victor Cebollada [Fri, 24 Apr 2015 06:33:49 +0000 (07:33 +0100)]
Selection Handled Scrolling - Step1

  *Decorator uses the same data structure to store the three handles.
  *Decorator uses the same code to send events to the controller for the three handles.

Change-Id: I14595b6531c55ecfffedc7a8266a2f70b927c5ce
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoAlpha function changes 14/38414/9
Ferran Sole [Mon, 20 Apr 2015 13:46:55 +0000 (14:46 +0100)]
Alpha function changes

Change-Id: I26579ded59bbbce7c1dcb4c9b068f22046879ab1

9 years agoMerge "(Page) Using registered properties" into tizen
Kimmo Hoikka [Fri, 24 Apr 2015 14:35:05 +0000 (07:35 -0700)]
Merge "(Page) Using registered properties" into tizen

9 years agoMerge "Delete view from toolkit and move cluster into demo" into tizen
Kimmo Hoikka [Fri, 24 Apr 2015 14:34:13 +0000 (07:34 -0700)]
Merge "Delete view from toolkit and move cluster into demo" into tizen

9 years ago(Page) Using registered properties 81/38681/3
Adeel Kazmi [Fri, 24 Apr 2015 10:33:06 +0000 (11:33 +0100)]
(Page) Using registered properties

Change-Id: I7e61c64244b9e0b9179287898295eb6778d9cef0

9 years agoDelete view from toolkit and move cluster into demo 79/38679/2
Kingsley Stephens [Fri, 17 Apr 2015 12:14:56 +0000 (13:14 +0100)]
Delete view from toolkit and move cluster into demo

Change-Id: I079a8b85eaedc2a9915db163f6ab1e5f17557c49

9 years agoTextField property updates 01/38601/18
Paul Wisbey [Wed, 22 Apr 2015 14:25:30 +0000 (15:25 +0100)]
TextField property updates

Change-Id: I5ee0b8ef3e7e0b9760a4731f05fb479dfe123be8

9 years ago(AutomatedTests) Removed control style-change test case 52/38652/1
Adeel Kazmi [Thu, 23 Apr 2015 13:52:13 +0000 (14:52 +0100)]
(AutomatedTests) Removed control style-change test case

Change-Id: Ie10be9b842a236c31eb17d5b391da419e71af170

9 years agoMerge "Cursor Scrolling." into tizen
Paul Wisbey [Thu, 23 Apr 2015 13:36:59 +0000 (06:36 -0700)]
Merge "Cursor Scrolling." into tizen

9 years agoMerge "Make cursor invisible when exceeds the boundaries of the Text Control." into...
Paul Wisbey [Thu, 23 Apr 2015 13:33:39 +0000 (06:33 -0700)]
Merge "Make cursor invisible when exceeds the boundaries of the Text Control." into tizen

9 years agoMerge "Text Decorator - Set positions in Control coords." into tizen
Paul Wisbey [Thu, 23 Apr 2015 13:33:25 +0000 (06:33 -0700)]
Merge "Text Decorator - Set positions in Control coords." into tizen

9 years agoFix the failed test case for ScrollView overshoot 50/38650/1
Richard Huang [Thu, 23 Apr 2015 13:04:41 +0000 (14:04 +0100)]
Fix the failed test case for ScrollView overshoot

Change-Id: I26e538df346d5ed98d6a5998b7eb07c1441948b8

9 years agoMerge "DALi Version 1.0.39" into tizen
Adeel Kazmi [Thu, 23 Apr 2015 11:08:20 +0000 (04:08 -0700)]
Merge "DALi Version 1.0.39" into tizen

9 years agoDALi Version 1.0.39 43/38643/1 dali_1.0.39
Xiangyin Ma [Thu, 23 Apr 2015 11:04:30 +0000 (12:04 +0100)]
DALi Version 1.0.39

Change-Id: Ie8c22ac0e9f6a8d08826bed7604c6768dc3fd5c4

9 years agoCursor Scrolling. 03/38603/5
Victor Cebollada [Wed, 15 Apr 2015 12:56:53 +0000 (13:56 +0100)]
Cursor Scrolling.

Change-Id: Ief97436d85ea16e4af852468785e40bdecb1a160
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years ago(AutomatedTests) Remove View test cases 36/38636/1
Adeel Kazmi [Thu, 23 Apr 2015 09:44:43 +0000 (10:44 +0100)]
(AutomatedTests) Remove View test cases

Change-Id: Icb8ed042dbb1b3f232face9103e045f353c164b9

9 years agoMake cursor invisible when exceeds the boundaries of the Text Control. 83/38583/5
Victor Cebollada [Wed, 22 Apr 2015 08:02:23 +0000 (09:02 +0100)]
Make cursor invisible when exceeds the boundaries of the Text Control.

Change-Id: I1a038bb45d6e7d5fca388aac6e1d1202a7874b9a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoText Decorator - Set positions in Control coords. 71/38571/5
Victor Cebollada [Tue, 21 Apr 2015 15:36:49 +0000 (16:36 +0100)]
Text Decorator - Set positions in Control coords.

Change-Id: I2417c24e4b5035e821ed7b311723a856973823a0
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge "Type registry macros made namespace-generic: toolkit" into tizen
Kimmo Hoikka [Wed, 22 Apr 2015 15:22:02 +0000 (08:22 -0700)]
Merge "Type registry macros made namespace-generic: toolkit" into tizen

9 years agoSplit text-controller files in text-controller and text-controller-impl. 15/38315/8
Victor Cebollada [Thu, 16 Apr 2015 08:53:05 +0000 (09:53 +0100)]
Split text-controller files in text-controller and text-controller-impl.

Change-Id: I72f41a8fba43da1570e7231904bead38d90310dc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoType registry macros made namespace-generic: toolkit 22/38522/4
Tom Robinson [Wed, 22 Apr 2015 10:24:12 +0000 (11:24 +0100)]
Type registry macros made namespace-generic: toolkit

Change-Id: I303755ba21cec9ef4c0e3a6d2cc1c74f9f0c8fae

9 years agoMerge "Test cases for new KeyInputFocus signals" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:08:23 +0000 (05:08 -0700)]
Merge "Test cases for new KeyInputFocus signals" into tizen

9 years agoMerge "Fixes crash when fontclient is unable to supply a correct bitmap" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:07:41 +0000 (05:07 -0700)]
Merge "Fixes crash when fontclient is unable to supply a correct bitmap" into tizen

9 years agoMerge "Fix to default Shadow Color setting" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:07:05 +0000 (05:07 -0700)]
Merge "Fix to default Shadow Color setting" into tizen

9 years agoTest cases for new KeyInputFocus signals 27/38527/2
Agnelo Vaz [Tue, 21 Apr 2015 16:17:18 +0000 (17:17 +0100)]
Test cases for new KeyInputFocus signals

Change-Id: If8898640d0e70fe20bb9a34b2d784d6cbc849c68
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "Remove unnecessary stream operators from radian and degree as well as unnecess...
Adeel Kazmi [Wed, 22 Apr 2015 10:23:35 +0000 (03:23 -0700)]
Merge "Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis" into tizen

9 years agoControls to Emit Signals when Key Input Focus lost or gained 11/38511/4
Agnelo Vaz [Tue, 21 Apr 2015 13:36:35 +0000 (14:36 +0100)]
Controls to Emit Signals when Key Input Focus lost or gained

Change-Id: Iecc83cf41be7783436fa5a936d1e17e8afa1f692
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoUpdate copyright year to 2015 for public api: toolkit 99/38499/2
Tom Robinson [Tue, 21 Apr 2015 11:03:19 +0000 (12:03 +0100)]
Update copyright year to 2015 for public api: toolkit

Change-Id: I63856bf33b9efe4984e6d5a1874acf2ec3f2955c

9 years agoMerge "Increased test coverage on TextLabel and TextField" into tizen
Paul Wisbey [Tue, 21 Apr 2015 13:30:40 +0000 (06:30 -0700)]
Merge "Increased test coverage on TextLabel and TextField" into tizen

9 years agoRemove unnecessary stream operators from radian and degree as well as unnecessary... 96/38496/2
Kimmo Hoikka [Tue, 21 Apr 2015 10:53:35 +0000 (11:53 +0100)]
Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis

Change-Id: Icc4edab7df8ba10e902964c8967bce04b1c7a7ea

9 years agoMerge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

9 years agoMerge "Cleanup for removal of ImageAttributes from public API" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:11:43 +0000 (10:11 -0700)]
Merge "Cleanup for removal of ImageAttributes from public API" into tizen