(ProgressBar) Ensure full progress image is shown when 100%

Before this patch, the track visual was always longer than the progress visual which meant
that 100% progress could never be shown.

Change-Id: I11fb81daf3b32096d0307904bff5a887311e0647

diff --git a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
index b8d9f59..ff3ed25 100755 (executable)
--- a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
@@ -59,7 +59,6 @@ const char* SKINNED_PROGRESS_VISUAL = DALI_IMAGE_DIR "slider-skin-progress.9.png
 float DEFAULT_VALUE = 0.0f;
 float DEFAULT_LOWER_BOUND = 0.0f;
 float DEFAULT_UPPER_BOUND = 1.0f;
-float DEFAULT_PADDING = 24.0f;
 
 } // Unnamed namespace
 
@@ -111,13 +110,10 @@ void ProgressBar::OnInitialize()
 
 void ProgressBar::OnRelayout( const Vector2& size, RelayoutContainer& container )
 {
-  Vector2 trackSize( size );
-  trackSize.width = std::max( 0.0f, size.width - DEFAULT_PADDING ); // Ensure we don't go negative
-
   // Track
   if( mTrack )
   {
-    container.Add( mTrack, trackSize );
+    container.Add( mTrack, size );
 
     // mValueTextLabel will have its relayout method called automatically as it's a child of mTrack,
     // which is added to the container
@@ -126,13 +122,13 @@ void ProgressBar::OnRelayout( const Vector2& size, RelayoutContainer& container
   // Progress bar
   if( mProgress )
   {
-    mDomain = CalcDomain( trackSize );
+    mDomain = CalcDomain( size );
 
-    Vector2 progressSize( trackSize );
+    Vector2 progressSize( size );
 
     // If no progress, then we do not want a n-patch image shown incorrectly
     progressSize.width = std::max( mProgressVisualSize.width, mDomain.from.x + mValue * ( mDomain.to.x - mDomain.from.x ) );
-    progressSize.width = std::min( progressSize.width, trackSize.width ); // We should not exceed given size
+    progressSize.width = std::min( progressSize.width, size.width ); // We should not exceed given size
 
     container.Add( mProgress, progressSize );
   }

diff --git a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
index 8c5661b..1809436 100644 (file)
--- a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * This file is part of Dali Toolkit
  *
@@ -184,11 +184,11 @@
     {
       "progressValue": 0,
       "trackVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin.9.png",
+        "url":"{DALI_IMAGE_DIR}progress-skin.9.png",
         "size":[24,24]
       },
       "progressVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png",
+        "url":"{DALI_IMAGE_DIR}progress-skin-progress.9.png",
         "size":[24,24]
       }
     },

diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index b188dab..0684889 100644 (file)
--- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@ -231,11 +231,11 @@
     {
       "progressValue": 0,
       "trackVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin.9.png",
+        "url":"{DALI_IMAGE_DIR}progress-skin.9.png",
         "size":[24,24]
       },
       "progressVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png",
+        "url":"{DALI_IMAGE_DIR}progress-skin-progress.9.png",
         "size":[24,24]
       }
     },

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 2f24933..69abfe1 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * This file is part of Dali Toolkit
  *
@@ -205,11 +205,11 @@
     {
       "progressValue": 0,
       "trackVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin.9.png",
+        "url":"{DALI_IMAGE_DIR}progress-skin.9.png",
         "size":[24,24]
       },
       "progressVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png",
+        "url":"{DALI_IMAGE_DIR}progress-skin-progress.9.png",
         "size":[24,24]
       }
     },

diff --git a/dali-toolkit/styles/images-common/progress-skin-progress.9.png b/dali-toolkit/styles/images-common/progress-skin-progress.9.png
new file mode 100644 (file)
index 0000000..f02cd0d
Binary files /dev/null and b/dali-toolkit/styles/images-common/progress-skin-progress.9.png differ

diff --git a/dali-toolkit/styles/images-common/progress-skin.9.png b/dali-toolkit/styles/images-common/progress-skin.9.png
new file mode 100644 (file)
index 0000000..e1c2ca0
Binary files /dev/null and b/dali-toolkit/styles/images-common/progress-skin.9.png differ