X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fslider%2Fslider-impl.cpp;h=88795492885f09b7ca12e5d26bf891c9eadb1461;hp=213818aa6673f4c3138ebb3d7c0edc0404ca776e;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=008860937020b303aab10d21132797ba3c2532f6

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
old mode 100755
new mode 100644
index 213818a..8879549
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,13 @@
 #include <cstring> // for strcmp
 #include <sstream>
 #include <limits>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
@@ -87,11 +88,11 @@ const float DEFAULT_HIT_HEIGHT = 72.0f;
 const float DEFAULT_HANDLE_HEIGHT = DEFAULT_HIT_HEIGHT;
 const float POPUP_TEXT_PADDING = 10.0f;
 
-const char* SKINNED_TRACK_VISUAL = DALI_IMAGE_DIR "slider-skin.9.png";
-const char* SKINNED_HANDLE_VISUAL = DALI_IMAGE_DIR "slider-skin-handle.png";
-const char* SKINNED_PROGRESS_VISUAL = DALI_IMAGE_DIR "slider-skin-progress.9.png";
-const char* SKINNED_POPUP_VISUAL = DALI_IMAGE_DIR "slider-popup.9.png";
-const char* SKINNED_POPUP_ARROW_VISUAL = DALI_IMAGE_DIR "slider-popup-arrow.png";
+const char* SKINNED_TRACK_VISUAL_FILE_NAME = "slider-skin.9.png";
+const char* SKINNED_HANDLE_VISUAL_FILE_NAME = "slider-skin-handle.png";
+const char* SKINNED_PROGRESS_VISUAL_FILE_NAME = "slider-skin-progress.9.png";
+const char* SKINNED_POPUP_VISUAL_FILE_NAME = "slider-popup.9.png";
+const char* SKINNED_POPUP_ARROW_VISUAL_FILE_NAME = "slider-popup-arrow.png";
 
 const Vector2 DEFAULT_HIT_REGION( DEFAULT_WIDTH, DEFAULT_HIT_HEIGHT );
 const Vector2 DEFAULT_TRACK_REGION( DEFAULT_WIDTH, DEFAULT_HEIGHT );
@@ -176,11 +177,12 @@ void Slider::OnInitialize()
   SetTrackRegion(   DEFAULT_TRACK_REGION   );
   SetHandleSize(    DEFAULT_HANDLE_SIZE    );
 
-  SetTrackVisual(            SKINNED_TRACK_VISUAL             );
-  SetHandleVisual(           SKINNED_HANDLE_VISUAL            );
-  SetProgressVisual(         SKINNED_PROGRESS_VISUAL          );
-  SetPopupVisual(            SKINNED_POPUP_VISUAL             );
-  SetPopupArrowVisual(       SKINNED_POPUP_ARROW_VISUAL       );
+  const std::string imageDirPath = AssetManager::GetDaliImagePath();
+  SetTrackVisual(            imageDirPath + SKINNED_TRACK_VISUAL_FILE_NAME             );
+  SetHandleVisual(           imageDirPath + SKINNED_HANDLE_VISUAL_FILE_NAME            );
+  SetProgressVisual(         imageDirPath + SKINNED_PROGRESS_VISUAL_FILE_NAME          );
+  SetPopupVisual(            imageDirPath + SKINNED_POPUP_VISUAL_FILE_NAME             );
+  SetPopupArrowVisual(       imageDirPath + SKINNED_POPUP_ARROW_VISUAL_FILE_NAME       );
 
   SetShowPopup( DEFAULT_SHOW_POPUP );
   SetShowValue( DEFAULT_SHOW_VALUE );
@@ -199,7 +201,7 @@ void Slider::OnInitialize()
   DisplayValue( mValue, false );       // Run this last to display the correct value
 
   // Size the Slider actor to a default
-  self.SetSize( DEFAULT_HIT_REGION.x, DEFAULT_HIT_REGION.y );
+  self.SetProperty( Actor::Property::SIZE, Vector2( DEFAULT_HIT_REGION.x, DEFAULT_HIT_REGION.y ) );
 
   // Connect to the touch signal
   self.TouchSignal().Connect( this, &Slider::OnTouch );
@@ -213,7 +215,7 @@ void Slider::OnRelayout( const Vector2& size, RelayoutContainer& container )
   Control::OnRelayout( size, container );
 }
 
-bool Slider::OnTouch(Actor actor, const TouchData& touch)
+bool Slider::OnTouch(Actor actor, const TouchEvent& touch)
 {
   if( mState != DISABLED )
   {
@@ -238,7 +240,7 @@ bool Slider::OnTouch(Actor actor, const TouchData& touch)
     }
   }
 
-  return true;
+  return false;
 }
 
 void Slider::OnPan( Actor actor, const PanGesture& gesture )
@@ -246,13 +248,13 @@ void Slider::OnPan( Actor actor, const PanGesture& gesture )
   // gesture.position is in local actor coordinates
   if( mState != DISABLED )
   {
-    switch( gesture.state )
+    switch( gesture.GetState() )
     {
       case Gesture::Continuing:
       {
         if( mState == PRESSED )
         {
-          float value = MapBounds( MarkFilter ( MapPercentage( gesture.position ) ), GetLowerBound(), GetUpperBound() );
+          float value = MapBounds( MarkFilter ( MapPercentage( gesture.GetPosition() ) ), GetLowerBound(), GetUpperBound() );
           SetValue( value );
           DisplayPopup( value );
         }
@@ -264,7 +266,7 @@ void Slider::OnPan( Actor actor, const PanGesture& gesture )
         {
           if( GetSnapToMarks() )
           {
-            float value = MapBounds( SnapToMark( MapPercentage( gesture.position ) ), GetLowerBound(), GetUpperBound() );
+            float value = MapBounds( SnapToMark( MapPercentage( gesture.GetPosition() ) ), GetLowerBound(), GetUpperBound() );
             SetValue( value );
             DisplayPopup( value );
           }
@@ -319,12 +321,12 @@ void Slider::DisplayValue( float value, bool raiseSignals )
 
   float x = mDomain.from.x + percent * ( mDomain.to.x - mDomain.from.x );
 
-  mHandle.SetX( x );
+  mHandle.SetProperty( Actor::Property::POSITION_X,  x );
 
   // Progress bar
   if( mProgress )
   {
-    mProgress.SetSize( x, GetTrackRegion().y );
+    mProgress.SetProperty( Actor::Property::SIZE, Vector2( x, GetTrackRegion().y ) );
   }
 
   // Signals
@@ -377,8 +379,8 @@ bool Slider::GetSnapToMarks() const
 Actor Slider::CreateHitRegion()
 {
   Actor hitRegion = Actor::New();
-  hitRegion.SetParentOrigin( ParentOrigin::CENTER );
-  hitRegion.SetAnchorPoint( AnchorPoint::CENTER );
+  hitRegion.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  hitRegion.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   hitRegion.TouchSignal().Connect( this, &Slider::OnTouch );
 
   return hitRegion;
@@ -387,9 +389,9 @@ Actor Slider::CreateHitRegion()
 Toolkit::ImageView Slider::CreateTrack()
 {
   Toolkit::ImageView track = Toolkit::ImageView::New();
-  track.SetName("SliderTrack");
-  track.SetParentOrigin( ParentOrigin::CENTER );
-  track.SetAnchorPoint( AnchorPoint::CENTER );
+  track.SetProperty( Dali::Actor::Property::NAME,"SliderTrack");
+  track.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  track.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   return track;
 }
 
@@ -428,7 +430,7 @@ void Slider::SetTrackVisual( Property::Map map )
       mTrackRegion = size;
       if( mTrack )
       {
-        mTrack.SetSize( mTrackRegion );
+        mTrack.SetProperty( Actor::Property::SIZE, mTrackRegion );
       }
 
     ResizeProgressRegion( Vector2( 0.0f, mTrackRegion.y ) );
@@ -449,9 +451,9 @@ std::string Slider::GetTrackVisual()
 Toolkit::ImageView Slider::CreateProgress()
 {
   Toolkit::ImageView progress = Toolkit::ImageView::New();
-  progress.SetName("SliderProgress");
-  progress.SetParentOrigin( ParentOrigin::CENTER_LEFT );
-  progress.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
+  progress.SetProperty( Dali::Actor::Property::NAME,"SliderProgress");
+  progress.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT );
+  progress.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT );
 
   return progress;
 }
@@ -568,16 +570,16 @@ void Slider::ResizeProgressRegion( const Vector2& region )
 {
   if( mProgress )
   {
-    mProgress.SetSize( region );
+    mProgress.SetProperty( Actor::Property::SIZE, region );
   }
 }
 
 Toolkit::ImageView Slider::CreateHandle()
 {
   Toolkit::ImageView handle = Toolkit::ImageView::New();
-  handle.SetName("SliderHandle");
-  handle.SetParentOrigin( ParentOrigin::CENTER_LEFT );
-  handle.SetAnchorPoint( AnchorPoint::CENTER );
+  handle.SetProperty( Dali::Actor::Property::NAME,"SliderHandle");
+  handle.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT );
+  handle.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
 
   return handle;
 }
@@ -586,9 +588,9 @@ Toolkit::ImageView Slider::CreatePopupArrow()
 {
   Toolkit::ImageView arrow = Toolkit::ImageView::New();
   arrow.SetStyleName("SliderPopupArrow");
-  arrow.SetName("SliderPopupArrow");
-  arrow.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-  arrow.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+  arrow.SetProperty( Dali::Actor::Property::NAME,"SliderPopupArrow");
+  arrow.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+  arrow.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
 
   return arrow;
 }
@@ -596,23 +598,23 @@ Toolkit::ImageView Slider::CreatePopupArrow()
 Toolkit::TextLabel Slider::CreatePopupText()
 {
   Toolkit::TextLabel textLabel = Toolkit::TextLabel::New();
-  textLabel.SetName( "SliderPopupTextLabel" );
+  textLabel.SetProperty( Dali::Actor::Property::NAME, "SliderPopupTextLabel" );
   textLabel.SetStyleName( "SliderPopupTextLabel" );
-  textLabel.SetParentOrigin( ParentOrigin::CENTER );
-  textLabel.SetAnchorPoint( AnchorPoint::CENTER );
+  textLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  textLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
   textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
   textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
-  textLabel.SetPadding( Padding( POPUP_TEXT_PADDING, POPUP_TEXT_PADDING, 0.0f, 0.0f ) );
+  textLabel.SetProperty( Actor::Property::PADDING, Padding( POPUP_TEXT_PADDING, POPUP_TEXT_PADDING, 0.0f, 0.0f ) );
   return textLabel;
 }
 
 Toolkit::ImageView Slider::CreatePopup()
 {
   Toolkit::ImageView popup = Toolkit::ImageView::New();
-  popup.SetName( "SliderPopup" );
-  popup.SetParentOrigin( ParentOrigin::TOP_CENTER );
-  popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+  popup.SetProperty( Dali::Actor::Property::NAME, "SliderPopup" );
+  popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+  popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
   popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );
 
   mValueTextLabel = CreatePopupText();
@@ -672,7 +674,7 @@ void Slider::ResizeHandleSize( const Vector2& size )
 {
   if( mHandle )
   {
-    mHandle.SetSize( size );
+    mHandle.SetProperty( Actor::Property::SIZE, size );
   }
 }
 
@@ -681,10 +683,10 @@ void Slider::CreateHandleValueDisplay()
   if( mHandle && !mHandleValueTextLabel )
   {
     mHandleValueTextLabel = Toolkit::TextLabel::New();
-    mHandleValueTextLabel.SetName("SliderHandleTextLabel");
+    mHandleValueTextLabel.SetProperty( Dali::Actor::Property::NAME,"SliderHandleTextLabel");
     mHandleValueTextLabel.SetStyleName("SliderHandleTextLabel");
-    mHandleValueTextLabel.SetParentOrigin( ParentOrigin::CENTER );
-    mHandleValueTextLabel.SetAnchorPoint( AnchorPoint::CENTER );
+    mHandleValueTextLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    mHandleValueTextLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
     mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
     mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
     mHandle.Add( mHandleValueTextLabel );
@@ -699,14 +701,14 @@ void Slider::DestroyHandleValueDisplay()
 Actor Slider::CreateValueDisplay()
 {
   Actor popup = Actor::New();
-  popup.SetParentOrigin( ParentOrigin::TOP_CENTER );
-  popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+  popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+  popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
 
   mPopupArrow = CreatePopupArrow();
   popup.Add( mPopupArrow );
 
   mPopup = CreatePopup();
-  mPopup.SetSize( 0.0f, VALUE_POPUP_HEIGHT );
+  mPopup.SetProperty( Actor::Property::SIZE, Vector2( 0.0f, VALUE_POPUP_HEIGHT ) );
   mPopupArrow.Add( mPopup );
 
   return popup;
@@ -733,17 +735,17 @@ void Slider::UpdateSkin()
   {
     case NORMAL:
     {
-      mTrack.SetColor( Color::WHITE );
-      mHandle.SetColor( Color::WHITE );
-      mProgress.SetColor( Color::WHITE );
+      mTrack.SetProperty( Actor::Property::COLOR, Color::WHITE );
+      mHandle.SetProperty( Actor::Property::COLOR, Color::WHITE );
+      mProgress.SetProperty( Actor::Property::COLOR, Color::WHITE );
       break;
     }
     case DISABLED:
     {
       Vector4 disabledColor = GetDisabledColor();
-      mTrack.SetColor( disabledColor );
-      mHandle.SetColor( disabledColor );
-      mProgress.SetColor( disabledColor );
+      mTrack.SetProperty( Actor::Property::COLOR, disabledColor );
+      mHandle.SetProperty( Actor::Property::COLOR, disabledColor );
+      mProgress.SetProperty( Actor::Property::COLOR, disabledColor );
       break;
     }
     case PRESSED:
@@ -787,7 +789,7 @@ void Slider::SetHitRegion( const Vector2& size )
 
   if( mHitArea )
   {
-    mHitArea.SetSize( mHitRegion );
+    mHitArea.SetProperty( Actor::Property::SIZE, mHitRegion );
   }
 }
 
@@ -801,7 +803,7 @@ void Slider::AddPopup()
   if( !mValueDisplay )
   {
     mValueDisplay = CreateValueDisplay();
-    mValueDisplay.SetVisible( false );
+    mValueDisplay.SetProperty( Actor::Property::VISIBLE, false );
     mHandle.Add( mValueDisplay );
 
     CreatePopupImage( GetPopupVisual() );
@@ -916,7 +918,7 @@ bool Slider::HideValueView()
 {
   if( mValueDisplay )
   {
-    mValueDisplay.SetVisible( false );
+    mValueDisplay.SetProperty( Actor::Property::VISIBLE, false );
   }
 
   return false;
@@ -961,7 +963,7 @@ void Slider::SetTrackRegion( const Vector2& region )
 
   if( mTrack )
   {
-    mTrack.SetSize( mTrackRegion );
+    mTrack.SetProperty( Actor::Property::SIZE, mTrackRegion );
   }
 
   ResizeProgressRegion( Vector2( 0.0f, mTrackRegion.y ) );
@@ -1119,7 +1121,7 @@ void Slider::DisplayPopup( float value )
 
     if( mValueDisplay )
     {
-      mValueDisplay.SetVisible( true );
+      mValueDisplay.SetProperty( Actor::Property::VISIBLE, true );
 
       mValueTimer.SetInterval( VALUE_VIEW_SHOW_DURATION );
     }
@@ -1378,8 +1380,15 @@ Property::Value Slider::GetProperty( BaseObject* object, Property::Index propert
 
       case Toolkit::Slider::Property::MARKS:
       {
-        // TODO: Need to be able to return a PropertyArray
-        // value = sliderImpl.GetMarks();
+        Property::Value value1( Property::ARRAY );
+        Property::Array* markArray = value1.GetArray();
+
+        if( markArray )
+        {
+          *markArray = sliderImpl.GetMarks();
+        }
+
+        value = value1;
         break;
       }