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

- KeyEventSignal() should return false value for not consuming the event.
- Changed the code using Deprecated API.
- Made comments on PushButton SetSize.
- Fixed the debug message correctly.

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 16fa782365f310851b9366a48c93aede6476d7dd..5d3dd1df8b721fb78033672e898a5de98714e26d 100644 (file)
--- 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 ea00ea3cbd88626b4955c444e03dbbe04e38ffeb..94c7263fbb0d0f1272fb677199bf0387585f3191 100644 (file)
--- 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);
 

diff --git a/tbtcoreapp-dali/src/view/tbt-dali-text-control-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-text-control-view.cpp
index 02231a8376119df24fabd4ac7fe2fd9de9e071fc..26c8886161932ba90d4cce1f73bdf2fefb11c2bd 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-text-control-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-text-control-view.cpp
@@ -104,9 +104,9 @@ void TBTDaliTextControlView::onTextChanged(TextEditor editor)
 }
 bool TBTDaliTextControlView::onKeyEventSignal(Control control, const KeyEvent& event)
 {
-       DBG("TBTDaliSliderView::onKeyEventSignal");
+       DBG("TBTDaliTextControlView::onKeyEventSignal");
        lblKeyEvent.SetProperty(TextLabel::Property::TEXT,"  KeyEvent signal called");
        lblKeyEvent.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
-       return true;
+       return false;
 }