X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftooltip%2Ftooltip.cpp;h=34b5482f36f483cbf78643781b47e3bf7bda2683;hb=e4eaa88f3c16c436082b8811984c6dfcefa0a848;hp=d9bb0527d357f9bfcd15e96a20abce5f50f386e4;hpb=410125f32fcd135226a2a0a668b2855ea9e17a69;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/tooltip/tooltip.cpp b/dali-toolkit/internal/controls/tooltip/tooltip.cpp index d9bb052..34b5482 100644 --- a/dali-toolkit/internal/controls/tooltip/tooltip.cpp +++ b/dali-toolkit/internal/controls/tooltip/tooltip.cpp @@ -286,7 +286,7 @@ void Tooltip::SetContent( Toolkit::Control& control, const Property::Value& valu if( connectSignals && ! mSignalsConnected ) { control.HoveredSignal().Connect( this, &Tooltip::OnHovered ); - control.SetLeaveRequired( true ); + control.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); mSignalsConnected = true; } } @@ -478,8 +478,8 @@ bool Tooltip::OnTimeout() mPopup.SetProperty( Toolkit::Popup::Property::ANIMATION_MODE, "NONE" ); mPopup.SetProperty( Toolkit::Popup::Property::BACKING_ENABLED, false ); // Disable the dimmed backing. mPopup.SetProperty( Toolkit::Popup::Property::TOUCH_TRANSPARENT, true ); // Let events pass through the popup - mPopup.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mPopup.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mPopup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + mPopup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Background mPopup.SetProperty( Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE, mBackgroundImage ); @@ -605,7 +605,7 @@ void Tooltip::OnRelayout( Actor actor ) Toolkit::Control control = mControl.GetHandle(); if( control ) { - Vector3 worldPos = control.GetCurrentWorldPosition(); + Vector3 worldPos = control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ); float height = control.GetRelayoutSize( Dimension::HEIGHT ); position.x = stageSize.width * 0.5f + worldPos.x - popupWidth * 0.5f; @@ -619,7 +619,7 @@ void Tooltip::OnRelayout( Actor actor ) Toolkit::Control control = mControl.GetHandle(); if( control ) { - Vector3 worldPos = control.GetCurrentWorldPosition(); + Vector3 worldPos = control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ); float height = control.GetRelayoutSize( Dimension::HEIGHT ); position.x = stageSize.width * 0.5f + worldPos.x - popupWidth * 0.5f; @@ -655,10 +655,10 @@ void Tooltip::OnRelayout( Actor actor ) if( yPosChanged && tail ) { // If we change the y position, then the tail may be shown pointing to the wrong control so just hide it. - tail.SetVisible( false ); + tail.SetProperty( Actor::Property::VISIBLE, false ); } - mPopup.SetPosition( position ); + mPopup.SetProperty( Actor::Property::POSITION, position ); } }