[TBT][DALi][Fixed fail issue]

Change-Id: I3049962dbdd8b349cf8ef2456b93de54311a0a32

diff --git a/release/binary-aarch64/org.tizen.tbtcoreapp-dali-1.0.0-aarch64.tpk b/release/binary-aarch64/org.tizen.tbtcoreapp-dali-1.0.0-aarch64.tpk
index 576265d88f93b20efacb3198ad53691402780917..9700c6c3924739cbac85bd7522e6681fcebd7797 100644 (file)
Binary files a/release/binary-aarch64/org.tizen.tbtcoreapp-dali-1.0.0-aarch64.tpk and b/release/binary-aarch64/org.tizen.tbtcoreapp-dali-1.0.0-aarch64.tpk differ

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 89f42a10a1a17424750efa8be6de4754d061ed52..30cb1ab5138ae35f78b376153f992139054cd7f5 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 6cc64bad549acfbd7be8a7fdb7bb5e6df7f26fc5..c86f3d1519d7f7e7067b5f4fb3585d01474dca2e 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/release/binary-x86_64/org.tizen.tbtcoreapp-dali-1.0.0-x86_64.tpk b/release/binary-x86_64/org.tizen.tbtcoreapp-dali-1.0.0-x86_64.tpk
index f997ed5a1e9a448fe0a798ade8575ef7a9db084e..d05cb631a65f1c987c4ef024ed42bb5215cf5aaa 100644 (file)
Binary files a/release/binary-x86_64/org.tizen.tbtcoreapp-dali-1.0.0-x86_64.tpk and b/release/binary-x86_64/org.tizen.tbtcoreapp-dali-1.0.0-x86_64.tpk differ

diff --git a/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h
index c211a63884be46c7056e67e9fe7d821cd205af5c..b7cd25cb7a84138671a1cc13417f7394b91d8f8e 100644 (file)
--- a/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h
+++ b/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h
@@ -52,6 +52,7 @@ private:
 
        WidgetView::WidgetViewManager mWidgetViewManager;
        WidgetView::WidgetView mWidgetView;
+       WidgetView::WidgetView mWidgetView_1;
 
 public:
        TBTDaliWidgetView(Application& mApplication, app_control_h _control);

diff --git a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
index 1a9d2e114c0148381d30e5b7e4c231a4afa24974..1755935b0f8006e007b597b1b731d046ff3007d4 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
@@ -33,11 +33,10 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
                        "\nTo perform the test:"
                        "\n1.   Run DALi Widget View."
                        "\n2.   Widget added signal will call after successfully launch widget on screen"
-                       "\n3.   Widget creation aborted signal will call if unable to launch widget"
-                       "\n4.   Active  button for re launch the widget if aborted signal are emit."
-                       "\n5.   Pause/Resume button are perform widget pause/resume respectively."
-                       "\n6.   Cancel button un-set the widget touch event."
-                       "\n7.   If the corresponding event signals mgs "
+                       "\n3.   Widget creation aborted signal will call after perform click on activate button"
+                       "\n4.   Pause/Resume button are perform widget pause/resume respectively."
+                       "\n5.   Cancel button un-set the widget touch event."
+                       "\n6.   If the corresponding event signals mgs "
                        "are changed then press <color value='green'><b>Pass</b></color>. "
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
 
@@ -84,7 +83,9 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
        }
 
        //Add widget
-       mWidgetView = mWidgetViewManager.AddWidget("org.tizen.calendar.widget", "", bodySize.width, 0.9*bodySize.width, 2000.0 );
+       //mWidgetView = mWidgetViewManager.AddWidget("org.tizen.calendar.widget", "", bodySize.width, 0.9*bodySize.width, 2000.0 );
+       mWidgetView = mWidgetViewManager.AddWidget("org.tizen.coretbtwidgetapp", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 );
+
        mWidgetView.SetParentOrigin( ParentOrigin::TOP_LEFT );
        mWidgetView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
        mWidgetView.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) );
@@ -92,12 +93,22 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
 
        mWidgetView.WidgetAddedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetAdded );
        mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetDeleted );
-       mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
-       mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::onWidgetContentUpdatedSignal );
-       mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::onWidgetFaultedSignal );
+       //mWidgetView.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
+       mWidgetView.WidgetContentUpdatedSignal().Connect( this, &TBTDaliWidgetView::onWidgetContentUpdatedSignal );
+       mWidgetView.WidgetFaultedSignal().Connect( this, &TBTDaliWidgetView::onWidgetFaultedSignal );
        //this->ctlBody.Add(mWidgetView);
        mTableView.AddChild(mWidgetView, TableView::CellPosition(4,0));
-       mTableView.SetFixedHeight(4, 0.9*bodySize.width);
+       mTableView.SetFixedHeight(4, 0.9*bodySize.width/2);
+
+       mWidgetView_1 = mWidgetViewManager.AddWidget("org.tizen.no.widget", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 );
+       mWidgetView_1.SetParentOrigin( ParentOrigin::TOP_LEFT );
+       mWidgetView_1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+       mWidgetView_1.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) );
+       mWidgetView_1.SetPosition( 0.0f, 0.0f );
+       mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
+
+       mTableView.AddChild(mWidgetView_1, TableView::CellPosition(5,0));
+       mTableView.SetFixedHeight(5, 0.9*bodySize.width/2);
 
        //
        Vector2 buttonSize=Vector2(bodySize.width/4, BUTTON_HEIGHT*bodySize.height);
@@ -166,7 +177,7 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
        else if(btnActivate==button)
        {
                DBG("btnActivate click");
-               mWidgetView.ActivateFaultedWidget();
+               mWidgetView_1.ActivateFaultedWidget();
        }
 
        return true;
@@ -175,7 +186,7 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
 void TBTDaliWidgetView::OnWidgetAdded( WidgetView::WidgetView widgetView )
 {
        DBG("TBTDaliWidgetView::OnWidgetAdded");
-       this->lblWidgetAdded.SetProperty( TextLabel::Property::TEXT, "  Widget Added Signal called" );
+       this->lblWidgetAdded.SetProperty( TextLabel::Property::TEXT, "    Widget Added Signal called" );
        this->lblWidgetAdded.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN);
 }