[TBT][DAli][Modified TC]

Change-Id: Ia0310d7b69b7324971986dde431a45d0f427bcdf

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk
index 25d5402500b0f60581b619c41f9a3b52b604df1b..9cec5c85041b97ea97fde084b24d277bb7fba48c 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk
index 38471f0c2ce4a057c65e8744ff2e76e27755ba29..36f718e1102108895888866a7242814ef8f0802f 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-i386.tpk differ

diff --git a/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp b/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp
index 621279a5865aeff05ce9c4f2235ece2ef1b3acf6..77a0fc9ace85e0cc3b8b2f954ef3479668c3c913 100644 (file)
--- a/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp
+++ b/tbtcoreapp-dali/src/tbtcoreapp-dali.cpp
@@ -78,10 +78,10 @@ public:
        {
                DBG(">>>>>>In Create");
                // Get a handle to the stage
-               //Stage stage = Stage::GetCurrent();
+               Stage stage = Stage::GetCurrent();
                //stage.GetRootLayer().TouchedSignal().Connect( this, &DaliTestController::OnTouch );
                //stage.KeyEventSignal().Connect( this, &DaliTestController::OnKeyEvent );
-               //stage.SceneCreatedSignal().Connect( this, &DaliTestController::onSceneCreated );
+               stage.SceneCreatedSignal().Connect( this, &DaliTestController::onSceneCreated );
                //this->ApplicationModule();
        }
        void onSceneCreated()

diff --git a/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp
index 481f9fa7ad6da122fb7cacdd0bd036f967102bc6..5d4bf1f30938866e3296e266bd7de36c02da8943 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp
@@ -146,7 +146,7 @@ TBTDaliActorView::TBTDaliActorView(Application& mApplication, app_control_h _con
        txtWheel=TextLabel::DownCast(ctlBody.GetChildAt(4));
        txtWheelData=TextLabel::DownCast(ctlBody.GetChildAt(5));
 
-       Vector2 buttonSize=Vector2(bodySize.width, BUTTON_HEIGHT*bodySize.height);
+       Vector2 buttonSize=Vector2(bodySize.width, 1.5*BUTTON_HEIGHT*bodySize.height);
        Vector2 position=Vector2(0.0f, bodySize.height - (buttonSize.height + VERTICAL_SPACE*bodySize.height));
        btnButton=CreateButton(AnchorPoint::TOP_LEFT, position, "Test Actor(Touch/Hover/Wheel) Signal", selectedColor, unSelectedColor, buttonSize);
        ctlBody.Add(btnButton);

diff --git a/tbtcoreapp-dali/src/view/tbt-dali-keyboard-focus-manager-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-keyboard-focus-manager-view.cpp
index 09e4d9059600ab516ab763a43d4d87233393722c..3edbd80b1b2177b59eec338a8a4cf4d477f1eb18 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-keyboard-focus-manager-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-keyboard-focus-manager-view.cpp
@@ -98,6 +98,7 @@ TBTDaliKeyBoardFocusManagerView::TBTDaliKeyBoardFocusManagerView(Application& mA
        PushButton button1=PushButton::DownCast(txtField.GetChildAt(1));
        button1.ClickedSignal().Connect(this, &TBTDaliKeyBoardFocusManagerView::OnButtonClick_1);
 
+
        lblPreFocus.SetKeyboardFocusable(true);
        lblFocusChange.SetKeyboardFocusable(true);
        lblFocusGroup.SetKeyboardFocusable(true);
@@ -114,7 +115,6 @@ TBTDaliKeyBoardFocusManagerView::TBTDaliKeyBoardFocusManagerView(Application& mA
        mFocusManager.FocusChangedSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusChanged );
        mFocusManager.FocusGroupChangedSignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusGroupChanged );
        mFocusManager.FocusedActorEnterKeySignal().Connect( this, &TBTDaliKeyBoardFocusManagerView::OnFocusedActorEnterKey );
-
 }
 bool TBTDaliKeyBoardFocusManagerView::OnButtonClick(Button button)
 {
@@ -141,6 +141,12 @@ bool TBTDaliKeyBoardFocusManagerView::onKeyEventSignal(Control control, const Ke
 Actor TBTDaliKeyBoardFocusManagerView::OnPreFocusChange(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction)
 {
        DBG("In TBTDaliKeyBoardFocusManagerView::OnPreFocusChange");
+
+       if(!current | !proposed)
+               DBG("current and proposed actor NULL");
+       else
+               DBG("Current Actor: %s  Proposed Actor: %s",current.GetName().c_str(),proposed.GetName().c_str());
+
        lblPreFocus.SetProperty(TextLabel::Property::TEXT,"Pre focus signal called");
        lblPreFocus.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
 
@@ -156,6 +162,10 @@ void TBTDaliKeyBoardFocusManagerView::OnFocusChanged(Actor current, Actor propos
 void TBTDaliKeyBoardFocusManagerView::OnFocusGroupChanged(Actor actor, bool bValue)
 {
        DBG("In TBTDaliKeyBoardFocusManagerView::OnFocusGroupChanged");
+       if(!actor)
+               DBG("Focus actor Null");
+       else
+               DBG("%s",actor.GetName().c_str());
 
        lblFocusGroup.SetProperty(TextLabel::Property::TEXT,"Focus group change signal called");
        lblFocusGroup.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
@@ -163,6 +173,7 @@ void TBTDaliKeyBoardFocusManagerView::OnFocusGroupChanged(Actor actor, bool bVal
 void TBTDaliKeyBoardFocusManagerView::OnFocusedActorEnterKey(Actor actor)
 {
        DBG("In TBTDaliKeyBoardFocusManagerView::OnFocusedActorEnterKey");
+       //mFocusManager.SetFocusIndicatorActor(actor);
 
        lblFocusActor.SetProperty(TextLabel::Property::TEXT,"Focus actor key signal called");
        lblFocusActor.SetProperty(TextLabel::Property::TEXT_COLOR,Color::GREEN);
@@ -171,6 +182,7 @@ bool TBTDaliKeyBoardFocusManagerView::OnUpClick(Button button)
 {
        DBG("In TBTDaliKeyBoardFocusManagerView::OnUpClick");
        //mFocusManager.MoveFocus(Control::KeyboardFocus::UP);
+       //mFocusManager.SetFocusIndicatorActor(txt_field);
        mFocusManager.SetCurrentFocusActor(txt_field);
        //txt1.SetKeyInputFocus();
        //mFocusManager.SetCurrentFocusActor(mrootTable);