From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 18 Sep 2014 15:59:19 +0000 (-0700)
Subject: Merge "(TextInput) Cursor is not moved to start of word when selecting text." into... 
X-Git-Tag: accepted/tizen/common/20140925.172059~13
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=162bd20f033e48bc1a13b275effb373b22a1b3b6;hp=f8118428cb455fb2503d07568ad62c79b07dc004

Merge "(TextInput) Cursor is not moved to start of word when selecting text." into tizen
---

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index ccf141a..ff6fbb9 100644
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -72,27 +72,6 @@ const Vector2 ANGLE_OUTER_CUBE_SWING(Math::PI * 0.5f, Math::PI * 0.5f);  ///< ou
 
 // Helpers ////////////////////////////////////////////////////////////////////////////////////////
 
-// TODO: GetAngle for Vector2 can be moved.
-// GetAngle for Vector3 needs to be measured against a normal/plane.
-
-/**
- * @param[in] vector The 3D vector to be measured
- * @return angle in radians from 0 to 2PI
- */
-float GetAngle(const Vector3& vector)
-{
-  return atan2(vector.y, vector.x) + Math::PI;
-}
-
-/**
- * @param[in] vector The 2D vector to be measured
- * @return angle in radians from 0 to 2PI
- */
-float GetAngle(const Vector2& vector)
-{
-  return atan2(vector.y, vector.x) + Math::PI;
-}
-
 /**
  * Find the vector (distance) from (a) to (b)
  * in domain (start) to (end)
diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
index 8cb5200..61060bf 100644
--- a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 8;
+const unsigned int TOOLKIT_MICRO_VERSION = 9;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index aae4ffd..d20e41c 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.0.8
+Version:    1.0.9
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0