From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Wed, 10 Jan 2018 02:09:30 +0000 (+0900)
Subject: [TBT][tbtcoreapp-dali][Non-ACR][Fixed dali app code]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fe369ac1088b603f35ddd9bcc33be935e78675c;p=test%2Ftct%2Fnative%2Fbehavior.git

[TBT][tbtcoreapp-dali][Non-ACR][Fixed dali app code]

- Changed the code using Deprecated API
- Make comments on PushButton SetSize

Change-Id: I4c7bfee0a8fff9622facc2e9c8300654987ed743
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---

diff --git a/tbtcoreapp-dali/inc/utils/config.h b/tbtcoreapp-dali/inc/utils/config.h
index 16fa782..5d3dd1d 100644
--- a/tbtcoreapp-dali/inc/utils/config.h
+++ b/tbtcoreapp-dali/inc/utils/config.h
@@ -73,7 +73,7 @@ extern bool __is_efl_test_running;
 
 #define TOOLBAR_BUTTON_DATA_KEY "button_id"
 
-#define LABEL_REL_PATH "res/"IMAGES_REL_FOLDER"/"
+#define LABEL_REL_PATH "res/IMAGES_REL_FOLDER/"
 #define LABEL_TEMPLATE "%s%s<br/>Dimension = %u x %u<br/>Result:E_SUCCESS"
 
 #define TABLE_PADDING_VERTICAL 20
diff --git a/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp b/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp
index 4929f15..5412c6d 100644
--- a/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp
+++ b/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp
@@ -119,8 +119,8 @@ PushButton UiUtils::CreateVerdictButton(TableView parent, TableView::CellPositio
 	PushButton button = PushButton::New();
 	button.SetAnchorPoint(anchorPoint);
 	button.SetPosition(position.x,position.y);
-	button.SetSize(size);
-	button.SetLabelText(label);
+	//button.SetSize(size);
+	button.SetProperty( Button::Property::LABEL, label );
 	button.SetProperty(Button::Property::UNSELECTED_COLOR, selectedColor);
 	button.SetProperty(Button::Property::SELECTED_COLOR, unselectedColor);
 	parent.AddChild(button, cellPosition);
@@ -138,8 +138,8 @@ PushButton UiUtils::CreateButton(Vector3 anchorPoint, Vector2 position, std::str
 	button.SetAnchorPoint(anchorPoint);
 	//button.SetParentOrigin(parentOrigin);
 	button.SetPosition(position.x,position.y);
-	button.SetSize(size);
-	button.SetLabelText(label);
+	//button.SetSize(size);
+	button.SetProperty( Button::Property::LABEL, label );
 	button.SetProperty(Button::Property::UNSELECTED_COLOR, selectedColor);
 	button.SetProperty(Button::Property::SELECTED_COLOR, unselectedColor);