From: Jahangir Date: Fri, 11 Nov 2016 21:21:11 +0000 (-0500) Subject: [TBT][DAli][Modified TC] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F97187%2F2;p=test%2Ftct%2Fnative%2Fbehavior.git [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 25d5402..9cec5c8 100644 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 38471f0..36f718e 100644 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 621279a..77a0fc9 100644 --- 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 481f9fa..5d4bf1f 100644 --- 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 09e4d90..3edbd80 100644 --- 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);