[TBT][DALi][NonACR][TSIX-3450 Change not to use deprecated APIs]

Fix to avoid crash issue

Change-Id: Ide2155b2374766c47ba34626097a86d0f003f1f5

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 4a790778c52c0ec417d124c6714e1b3cd850188c..4fbe02cbfe3d6915c5aba74e79763403d8faa7c9 100755 (executable)
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/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h b/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h
index 486487d2b97ab4424a2149268fba0cf3ca373e78..de9dae652821fa339685290261df2cee00472e42 100644 (file)
--- a/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h
+++ b/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h
@@ -54,6 +54,7 @@ private:
        WidgetView::WidgetViewManager mWidgetViewManager;
        WidgetView::WidgetView mWidgetView;
        WidgetView::WidgetView mWidgetView_1;
+       bool mWidgetLaunched;
 
 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 f635c35e06d78371ce1e26e308cae216d683591e..a13cc74d86bd56a7a0098531cc4106d16e46f5fc 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
@@ -46,6 +46,7 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
                        "Otherwise, press <color value='red'><b>Fail</b></color>";
 
        Stage stage = Stage::GetCurrent();
+       mWidgetLaunched = false;
 
        mTableView=TableView::New(16,4);
        mTableView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
@@ -84,25 +85,25 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
        Vector2 buttonSize=Vector2(bodySize.width/5, BUTTON_HEIGHT*bodySize.height);
        Vector2 position=Vector2(0.0f, 0.0f);
 
+    btnLaunchWidget=CreateButton(AnchorPoint::TOP_LEFT, position, "launch", selectedRedColor, unSelectedRedColor, buttonSize);
+       btnLaunchWidget.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked );
+       mTableView.AddChild(btnLaunchWidget,TableView::CellPosition(15,0));
+
        btnActivate=CreateButton(AnchorPoint::TOP_LEFT, position, "Activate", selectedColor, unSelectedColor, buttonSize);
        btnActivate.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked );
-       mTableView.AddChild(btnActivate,TableView::CellPosition(15,0));
+       mTableView.AddChild(btnActivate,TableView::CellPosition(15,1));
 
        btnPause=CreateButton(AnchorPoint::TOP_LEFT, position, "Pause", unSelectedColor, selectedColor , buttonSize);
        btnPause.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked );
-       mTableView.AddChild(btnPause,TableView::CellPosition(15,1));
+       mTableView.AddChild(btnPause,TableView::CellPosition(15,2));
 
        btnResume=CreateButton(AnchorPoint::TOP_LEFT, position, "Resume", selectedColor, unSelectedColor, buttonSize);
        btnResume.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked );
-       mTableView.AddChild(btnResume,TableView::CellPosition(15,2));
+       mTableView.AddChild(btnResume,TableView::CellPosition(15,3));
 
        btnCancel=CreateButton(AnchorPoint::TOP_LEFT, position, "Cancel", unSelectedColor, selectedColor, buttonSize);
        btnCancel.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked );
-       mTableView.AddChild(btnCancel,TableView::CellPosition(15,3));
-
-    btnLaunchWidget=CreateButton(AnchorPoint::TOP_LEFT, position, "launch", selectedRedColor, unSelectedRedColor, buttonSize);
-       btnLaunchWidget.ClickedSignal().Connect( this, &TBTDaliWidgetView::OnButtonClicked );
-       mTableView.AddChild(btnLaunchWidget,TableView::CellPosition(15,4));
+       mTableView.AddChild(btnCancel,TableView::CellPosition(15,4));
 }
 void TBTDaliWidgetView::onWidgetCreationAbortedSignal(WidgetView::WidgetView widgetView)
 {
@@ -128,6 +129,12 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
 
        if( button == btnPause )
        {
+               if( mWidgetLaunched == false )
+               {
+                       DBG("widget is not lauched. Please Click on launch button first");
+                       return false;
+               }
+
                if(! mWidgetView.PauseWidget())
                        DBG("Widget pause failed");
                else
@@ -135,6 +142,12 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
        }
        else if( button == btnResume )
        {
+               if( mWidgetLaunched == false )
+               {
+                       DBG("widget is not lauched. Please Click on launch button first");
+                       return false;
+               }
+
                if(! mWidgetView.ResumeWidget())
                        DBG("Widget resume failed");
                else {
@@ -143,6 +156,12 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
        }
        else if( button == btnCancel )
        {
+               if( mWidgetLaunched == false )
+               {
+                       DBG("widget is not lauched. Please Click on launch button first");
+                       return false;
+               }
+
                if(! mWidgetView.CancelTouchEvent())
                        DBG("Cancel touch event failed.");
                else
@@ -150,6 +169,12 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
        }
        else if(btnActivate==button)
        {
+               if( mWidgetLaunched == false )
+               {
+                       DBG("widget is not lauched. Please Click on launch button first");
+                       return false;
+               }
+
                DBG("btnActivate click");
                mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
                mWidgetView_1.ActivateFaultedWidget();
@@ -190,6 +215,7 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
 
                mTableView.AddChild(mWidgetView_1, TableView::CellPosition(5,0));
                mTableView.SetFixedHeight(5, 0.9*bodySize.width/2);
+               mWidgetLaunched = true;
        }
 
        return true;