From: Sunghyun Kim Date: Thu, 23 Apr 2020 09:22:52 +0000 (+0900) Subject: [TBT][DALi][NonACR][TSIX-2925 Change not to use deprecated APIs] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7656c410ca1a28bd8f2cd284703751c758d499c8;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][DALi][NonACR][TSIX-2925 Change not to use deprecated APIs] If WidgetView launch before the app launches,sometimes it makes flick issue. Fixed TBT to avoid this issue. Change-Id: Iad32ea9585c80799e52f897ed4a32127a62f7ca1 --- 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 e61ca60..4a79077 100755 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 b7cd25c..486487d 100644 --- a/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h +++ b/tbtcoreapp-dali/inc/view/tbt-dali-widget-view.h @@ -49,6 +49,7 @@ private: PushButton btnPause; PushButton btnResume; PushButton btnCancel; + PushButton btnLaunchWidget; WidgetView::WidgetViewManager mWidgetViewManager; WidgetView::WidgetView mWidgetView; diff --git a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp index e437eea..f635c35 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp @@ -25,6 +25,10 @@ #include "view/tbt-dali-widget-view.h" + +const Vector4 selectedRedColor=Vector4(0.9f, 0.55f, 0.55f, 1.0f); +const Vector4 unSelectedRedColor=Vector4(0.9f, 0.8f, 0.8f, 1.0f); + TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _control) : UiUtils(mApplication, _control) { @@ -32,11 +36,12 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c mInfoText=std::string("")+ "\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 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 " + "\n2. Click on launch button for launch WidgetView." + "\n3. Widget added signal will call after successfully launch widget on screen" + "\n4. Widget creation aborted signal will call after perform click on activate button" + "\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 " "are changed then press Pass. " "Otherwise, press Fail"; @@ -75,43 +80,8 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c // mTableView.SetFixedHeight(2, 0.9*TEXTLABEL_HEIGHT * bodySize.height); // mTableView.SetFixedHeight(3, 0.9*TEXTLABEL_HEIGHT * bodySize.height); - mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, "org.tizen.tbtcoreapp-dali" ); - if( !mWidgetViewManager ) - { - DBG("Widget is not enabled!"); - return; - } - - //Add widget - //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) ); - mWidgetView.SetPosition( 0.0f, 0.0f ); - - mWidgetView.WidgetAddedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetAdded ); - mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetDeleted ); - //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/2); - - mWidgetView_1 = mWidgetViewManager.AddWidget("org.example.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); + Vector2 buttonSize=Vector2(bodySize.width/5, BUTTON_HEIGHT*bodySize.height); Vector2 position=Vector2(0.0f, 0.0f); btnActivate=CreateButton(AnchorPoint::TOP_LEFT, position, "Activate", selectedColor, unSelectedColor, buttonSize); @@ -129,6 +99,10 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c 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)); } void TBTDaliWidgetView::onWidgetCreationAbortedSignal(WidgetView::WidgetView widgetView) { @@ -180,6 +154,43 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button ) mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal ); mWidgetView_1.ActivateFaultedWidget(); } + else if(btnLaunchWidget==button) + { + DBG("btnLaunch click"); + mWidgetViewManager = WidgetView::WidgetViewManager::New( mApplication, "org.tizen.tbtcoreapp-dali" ); + if( !mWidgetViewManager ) + { + DBG("Widget is not enabled!"); + return false; + } + + //Add widget + //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) ); + mWidgetView.SetPosition( 0.0f, 0.0f ); + + mWidgetView.WidgetAddedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetAdded ); + mWidgetView.WidgetDeletedSignal().Connect( this, &TBTDaliWidgetView::OnWidgetDeleted ); + //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/2); + + mWidgetView_1 = mWidgetViewManager.AddWidget("org.example.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); + } return true; }