From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Fri, 24 Jul 2015 15:10:34 +0000 (-0700)
Subject: Merge "Button SetLabel padding fix" into devel/master
X-Git-Tag: dali_1.0.51~9
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=28d0de15155c9923010da5c53eb1a96cbf6cd6e4;hp=4517298d9e2e87d3814ddd311233568ef10f7018

Merge "Button SetLabel padding fix" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
index a56ad13..ac22fe9 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
@@ -236,8 +236,8 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event1 = Dali::Integration::TouchEvent();
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
-    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 10.0f, 10.0f );
-    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 10.0f, 10.0f );
+    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 1.0f, 1.0f );
+    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 1.0f, 1.0f );
 
     event1.AddPoint( pointDown );
     application.ProcessEvent( event1 );
@@ -257,8 +257,8 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event1 = Dali::Integration::TouchEvent();
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
-    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 10.0f, 10.0f );
-    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 10.0f, 10.0f );
+    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 1.0f, 1.0f );
+    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 1.0f, 1.0f );
 
     event1.AddPoint( pointDown );
     application.ProcessEvent( event1 );
@@ -278,8 +278,8 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event1 = Dali::Integration::TouchEvent();
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
-    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 10.0f, 50.0f );
-    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 10.0f, 50.0f );
+    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 1.0f, 41.0f );
+    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 1.0f, 41.0f );
 
     event1.AddPoint( pointDown );
     application.ProcessEvent( event1 );
@@ -299,8 +299,8 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event1 = Dali::Integration::TouchEvent();
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
-    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 10.0f, 500.0f );
-    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 10.0f, 500.0f );
+    const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 1.0f, 500.0f );
+    const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 1.0f, 500.0f );
 
     event1.AddPoint( pointDown );
     application.ProcessEvent( event1 );