Merge "Removed AffectedByLighting APIs from MeshActor" into tizen

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 0cd53c9..441be04 100755 (executable)
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -350,7 +350,7 @@ void Popup::ShowTail(const Vector3& position)
   {
     Image tail = ResourceImage::New( image );
     mTailImage = ImageActor::New(tail);
-    const Vector3 anchorPoint = AnchorPoint::FRONT_BOTTOM_RIGHT - position;
+    const Vector3 anchorPoint = AnchorPoint::BOTTOM_RIGHT - position;
 
     mTailImage.SetParentOrigin(position);
     mTailImage.SetAnchorPoint(anchorPoint);

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index 509a13e..ad1576d 100755 (executable)
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -442,7 +442,7 @@ ImageActor Slider::CreateBacking()
 
 void Slider::SetBackingImageName( const std::string& imageName )
 {
-  if( mBacking && imageName != String::EMPTY )
+  if( mBacking && ( imageName.size() > 0 ) )
   {
     Image image = ResourceImage::New( imageName );
     mBacking.SetImage( image );
@@ -471,7 +471,7 @@ ImageActor Slider::CreateProgress()
 
 void Slider::SetProgressImageName( const std::string& imageName )
 {
-  if( mProgress && imageName != String::EMPTY )
+  if( mProgress && ( imageName.size() > 0 ) )
   {
     Image image = ResourceImage::New( imageName );
     mProgress.SetImage( image );
@@ -500,7 +500,7 @@ std::string Slider::GetPopupImageName()
 
 void Slider::CreatePopupImage( const std::string& imageName )
 {
-  if( mPopup && imageName != String::EMPTY )
+  if( mPopup && ( imageName.size() > 0 ) )
   {
     Image image = ResourceImage::New( imageName );
     mPopup.SetImage( image );
@@ -519,7 +519,7 @@ std::string Slider::GetPopupArrowImageName()
 
 void Slider::CreatePopupArrowImage( const std::string& imageName )
 {
-  if( mPopupArrow && imageName != String::EMPTY )
+  if( mPopupArrow && ( imageName.size() > 0 ) )
   {
     Image image = ResourceImage::New( imageName );
     mPopupArrow.SetImage( image );
@@ -578,7 +578,7 @@ ImageActor Slider::CreatePopup()
 
 void Slider::SetHandleImageName( const std::string& imageName )
 {
-  if( mHandle && imageName != String::EMPTY )
+  if( mHandle && ( imageName.size() > 0 ) )
   {
     Image image = ResourceImage::New( imageName );
     mHandle.SetImage( image );