From: Seoyeon Kim Date: Wed, 18 Sep 2019 04:38:48 +0000 (+0900) Subject: [TBT][tbtcoreapp-dali][Non-ACR][Fix TBT behavior of removed APIs] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F214115%2F4;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][tbtcoreapp-dali][Non-ACR][Fix TBT behavior of removed APIs] - As per ACR-1435, some APIs, which are removed already, are still used in tbtcoreapp-dali. Change-Id: I7085da029aeac58f88cc8414fc323091c71a7f6e Signed-off-by: Seoyeon Kim --- diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk index f070d19..c01085e 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.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 9e0f0e5..07da7d4 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/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk index c9896ff..35d7292 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk index 0070137..bc41fe9 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk differ diff --git a/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp b/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp index 94c7263..c5b6aba 100644 --- a/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp +++ b/tbtcoreapp-dali/src/utils/dali-ui-utils.cpp @@ -121,8 +121,16 @@ PushButton UiUtils::CreateVerdictButton(TableView parent, TableView::CellPositio button.SetPosition(position.x,position.y); //button.SetSize(size); button.SetProperty( Button::Property::LABEL, label ); - button.SetProperty(Button::Property::UNSELECTED_COLOR, selectedColor); - button.SetProperty(Button::Property::SELECTED_COLOR, unselectedColor); + + Property::Map propertyMap; + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, selectedColor); + button.SetProperty(Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap); + + Property::Map propertyMap1; + propertyMap1.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap1.Insert(ColorVisual::Property::MIX_COLOR, unselectedColor); + button.SetProperty(Button::Property::SELECTED_BACKGROUND_VISUAL, propertyMap1); parent.AddChild(button, cellPosition); button.ClickedSignal().Connect(obj, onClickedCallback); @@ -140,8 +148,15 @@ PushButton UiUtils::CreateButton(Vector3 anchorPoint, Vector2 position, std::str button.SetPosition(position.x,position.y); //button.SetSize(size); button.SetProperty( Button::Property::LABEL, label ); - button.SetProperty(Button::Property::UNSELECTED_COLOR, selectedColor); - button.SetProperty(Button::Property::SELECTED_COLOR, unselectedColor); + Property::Map propertyMap; + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, selectedColor); + button.SetProperty(Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap); + + Property::Map propertyMap1; + propertyMap1.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap1.Insert(ColorVisual::Property::MIX_COLOR, unselectedColor); + button.SetProperty(Button::Property::SELECTED_BACKGROUND_VISUAL, propertyMap1); //button.ClickedSignal().Connect(obj, onClickedCallback); return button; @@ -168,8 +183,7 @@ Control UiUtils::CreateTextField(Vector3 anchorPoint, Vector3 parentOrigin, Vect customTextField.SetParentOrigin(parentOrigin); customTextField.SetSize( size); customTextField.SetPosition( position.x,position.y ); - Image customTextFieldBgImage = ResourceImage::New( this->mImageDirectory+"customTextFieldBgImage.jpg" ); - customTextField.SetBackgroundImage(customTextFieldBgImage); + customTextField.SetProperty( Control::Property::BACKGROUND, this->mImageDirectory+"customTextFieldBgImage.jpg" ); TextField field=TextField::New(); field.SetAnchorPoint(anchorPoint); @@ -189,8 +203,8 @@ Control UiUtils::CreateTextField(Vector3 anchorPoint, Vector3 parentOrigin, Vect btnCross.SetParentOrigin(parentOrigin); btnCross.SetSize( size.width/10, size.height ); btnCross.SetPosition( size.width - size.width/10, 0.0f ); - btnCross.SetUnselectedImage( this->mImageDirectory + "innerButtonUnselected.png" ); - btnCross.SetSelectedImage( this->mImageDirectory + "innerButtonSelected.png" ); + btnCross.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, this->mImageDirectory + "innerButtonUnselected.png" ); + btnCross.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, this->mImageDirectory + "innerButtonSelected.png" ); //btnCross.ClickedSignal().Connect( obj, onClickedCallback ); customTextField.Add(btnCross); @@ -223,8 +237,8 @@ Control UiUtils::CreateTextEditor(Vector3 anchorPoint, Vector3 parentOrigin, Vec btnCross.SetParentOrigin(parentOrigin); btnCross.SetSize( bodySize.width*TEXTEDITOR_HEIGHT, bodySize.height*TEXTEDITOR_HEIGHT ); btnCross.SetPosition( size.width - size.width/10, 0.0f ); - btnCross.SetUnselectedImage( this->mImageDirectory + "innerButtonSelected.png" ); - btnCross.SetSelectedImage( this->mImageDirectory + "innerButtonUnselected.png" ); + btnCross.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, this->mImageDirectory + "innerButtonSelected.png" ); + btnCross.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, this->mImageDirectory + "innerButtonUnselected.png" ); //btnCross.ClickedSignal().Connect( obj, onClickedCallback ); customTextEditor.Add(btnCross); diff --git a/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp index 5d4bf1f..5caecc4 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-actor-view.cpp @@ -185,7 +185,16 @@ bool TBTDaliActorView::cbTouchedSignal(Actor actor, const TouchEvent& event) Actor hitActor=touchpoint.hitActor; PushButton btn=PushButton::DownCast(hitActor); txt.append(", Hit Actor: "); - txt.append(btn.GetLabelText()); + + Property::Value value = btn.GetProperty( Toolkit::Button::Property::LABEL ); + Property::Map *labelProperty = value.GetMap(); + std::string textLabel; + if( labelProperty ) + { + Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); + value->Get( textLabel ); + } + txt.append(textLabel); //state txt.append(", State: "); @@ -255,7 +264,15 @@ bool TBTDaliActorView::cbHoveredSignal(Actor actor, const HoverEvent& event) Actor hitActor=touchpoint.hitActor; PushButton btn=PushButton::DownCast(hitActor); txt.append(", Hit Actor: "); - txt.append(btn.GetLabelText()); + Property::Value value = btn.GetProperty( Toolkit::Button::Property::LABEL ); + Property::Map *labelProperty = value.GetMap(); + std::string textLabel; + if( labelProperty ) + { + Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); + value->Get( textLabel ); + } + txt.append(textLabel); //state txt.append(", State: "); diff --git a/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp index 5dc9827..119f515 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-pan-gesture-angle-direction-view.cpp @@ -75,12 +75,20 @@ TBTDaliPanGestureAngleDirectionView::TBTDaliPanGestureAngleDirectionView(Applica btnAddremove.SetParentOrigin(ParentOrigin::BOTTOM_CENTER); btnAddremove.SetPosition(0.0f, -10.0f); btnAddremove.ClickedSignal().Connect(this, &TBTDaliPanGestureAngleDirectionView::OnSetunSetButtonClick); - btnAddremove.SetProperty(Button::Property::UNSELECTED_COLOR, selectedColor); - btnAddremove.SetProperty(Button::Property::SELECTED_COLOR, unSelectedColor); + + Property::Map propertyMap; + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, selectedColor); + btnAddremove.SetProperty(Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap); + + Property::Map propertyMap1; + propertyMap1.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap1.Insert(ColorVisual::Property::MIX_COLOR, unSelectedColor); + btnAddremove.SetProperty(Button::Property::SELECTED_BACKGROUND_VISUAL, propertyMap1); btnAddremove.SetSize(this->bodySize.width, BUTTON_HEIGHT * bodySize.height); this->ctlBody.Add(btnAddremove); if(flag==false) - btnAddremove.SetLabelText("Remove Angle & Direction"); + btnAddremove.SetProperty( Toolkit::Button::Property::LABEL, "Remove Angle & Direction" ); setUnset(); } void TBTDaliPanGestureAngleDirectionView::setUnset() @@ -94,7 +102,7 @@ void TBTDaliPanGestureAngleDirectionView::setUnset() pangesturedetector.AddAngle(angle,threshold); pangesturedetector.AddDirection( PanGestureDetector::DIRECTION_LEFT, Radian( Math::PI * 0.25 ) ); flag=true; - btnAddremove.SetLabelText("Remove Angle & Direction"); + btnAddremove.SetProperty( Toolkit::Button::Property::LABEL, "Remove Angle & Direction" ); } else { @@ -103,7 +111,7 @@ void TBTDaliPanGestureAngleDirectionView::setUnset() pangesturedetector.RemoveDirection(PanGestureDetector::DIRECTION_LEFT); pangesturedetector.ClearAngles(); flag=false; - btnAddremove.SetLabelText("Add Angle & Direction"); + btnAddremove.SetProperty( Toolkit::Button::Property::LABEL, "Add Angle & Direction" ); } } void TBTDaliPanGestureAngleDirectionView::OnPanGestureDetector(Actor actor, const PanGesture& gesture) diff --git a/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp index c69f982..426667b 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-stage-view.cpp @@ -271,17 +271,16 @@ bool TBTDaliStageView::OnButtonClicked(Button button) { //mApplication.AddIdle( MakeCallback( TBTDaliStageView::NewWindow ) ); // textButton=PushButton::New(); -// textButton.SetProperty(Button::Property::LABEL_TEXT,"Test Button"); +// textButton.SetProperty(Button::Property::LABEL,"Test Button"); // mrootTable.AddChild(textButton,TableView::CellPosition(11,0)); -// -// textButton.SetSelectedImage( "/images/gallery-medium-0.jpg" ); +// textButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, "/images/gallery-medium-0.jpg" ); } else { bCheck=false; //gApplication.Reset(); -// textButton.SetUnselectedImage( "/images/gallery-medium-1.jpg" ); + //textButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, "/images/gallery-medium-1.jpg" ); // mrootTable.RemoveChildAt(TableView::CellPosition(11,0)); } return true; diff --git a/tbtcoreapp-dali/src/view/tbt-dali-tts-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-tts-view.cpp index 2537823..35147c3 100644 --- a/tbtcoreapp-dali/src/view/tbt-dali-tts-view.cpp +++ b/tbtcoreapp-dali/src/view/tbt-dali-tts-view.cpp @@ -103,23 +103,23 @@ void TBTTTSView::updateViewControls() DBG("TBTTTSView::updateViewControls"); if (tts.GetState() == TtsPlayer::PLAYING) { - playButton.SetDisabled(true); - interruptButton.SetDisabled(false); - interruptButton.SetLabelText("Pause"); - stopButton.SetDisabled(false); + playButton.SetProperty( Button::Property::DISABLED, true); + interruptButton.SetProperty( Button::Property::DISABLED, false); + interruptButton.SetProperty( Toolkit::Button::Property::LABEL, "Pause" ); + stopButton.SetProperty( Button::Property::DISABLED, false); } else if (tts.GetState() == TtsPlayer::PAUSED) { - playButton.SetDisabled(true); - interruptButton.SetDisabled(false); - interruptButton.SetLabelText("Resume"); - stopButton.SetDisabled(false); + playButton.SetProperty( Button::Property::DISABLED, true); + interruptButton.SetProperty( Button::Property::DISABLED, false); + interruptButton.SetProperty( Toolkit::Button::Property::LABEL, "Resume" ); + stopButton.SetProperty( Button::Property::DISABLED, false); } else { - playButton.SetDisabled(false); - interruptButton.SetDisabled(true); - stopButton.SetDisabled(true); + playButton.SetProperty( Button::Property::DISABLED, false); + interruptButton.SetProperty( Button::Property::DISABLED, true); + stopButton.SetProperty( Button::Property::DISABLED, true); } }