X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fvideo-view%2Fvideo-view-impl.cpp;h=a0a696a32bd1b160d030d21dff1c87f0b683e3d9;hp=8c34ab5dc464e5f67144918245843d41b038a676;hb=078278a2ea58db1f07114513bf21783eb689f63a;hpb=a2cdd50ec94555ef2ff893e6a7056f921b3266a5 diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp old mode 100755 new mode 100644 index 8c34ab5..a0a696a --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -611,7 +610,7 @@ void VideoView::SetWindowSurfaceTarget() { Actor self = Self(); - if( !self.OnStage() ) + if( !self.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { // When the control is off the stage, it does not have Window. return; @@ -736,11 +735,11 @@ void VideoView::UpdateDisplayArea( Dali::PropertyNotification& source ) Actor self( Self() ); - bool positionUsesAnchorPoint = self.GetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >(); - Vector3 actorSize = self.GetCurrentSize() * self.GetCurrentScale(); - Vector3 anchorPointOffSet = actorSize * ( positionUsesAnchorPoint ? self.GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT ); + bool positionUsesAnchorPoint = self.GetProperty( Actor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >(); + Vector3 actorSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * self.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ); + Vector3 anchorPointOffSet = actorSize * ( positionUsesAnchorPoint ? self.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) : AnchorPoint::TOP_LEFT ); - Vector2 screenPosition = self.GetProperty( DevelActor::Property::SCREEN_POSITION ).Get< Vector2 >(); + Vector2 screenPosition = self.GetProperty( Actor::Property::SCREEN_POSITION ).Get< Vector2 >(); mDisplayArea.x = screenPosition.x - anchorPointOffSet.x; mDisplayArea.y = screenPosition.y - anchorPointOffSet.y;