-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+// CLASS HEADER
#include <dali-toolkit/internal/controls/magnifier/magnifier-impl.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/active-constraint.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/public-api/images/resource-image.h>
+
using namespace Dali;
namespace // unnamed namespace
{
const Vector3& sourcePosition = sourcePositionProperty.GetVector3();
- return Vector3(sourcePosition.x + mStageSize.x * 0.5f,
- -sourcePosition.y + mStageSize.y * 0.5f,
- sourcePosition.z + mDefaultCameraDistance);
+ return Vector3( sourcePosition.x + mStageSize.x * 0.5f,
+ sourcePosition.y + mStageSize.y * 0.5f,
+ sourcePosition.z + mDefaultCameraDistance);
}
Vector2 mStageSize;
}
};
-/**
- * Returns relative border (0.0f...1.0f x 0.0f...1.0f)
- * from an absolute pixel specified border.
- * @param[in] absolute A border using absolute pixel coordinates
- * @param[in] width The width of the texture
- * @param[in] height The height of the texture.
- * @return A border relative to the size of the Image texture dimensions.
- */
-Vector4 GetRelativeBorder(Vector4 absolute, float width, float height)
-{
- return Vector4( absolute.x / width,
- absolute.y / height,
- absolute.z / width,
- absolute.w / height);
-}
-
}
namespace Dali
}
Magnifier::Magnifier()
-: ControlImpl(true),
+: Control( REQUIRES_TOUCH_EVENTS ),
mPropertySourcePosition(Property::INVALID_INDEX),
+ mDefaultCameraDistance(1000.f),
mActorSize(Vector3::ZERO),
mMagnificationFactor(1.0f)
{
mPropertySourcePosition = self.RegisterProperty( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME, Vector3::ZERO );
Vector2 stageSize(Stage::GetCurrent().GetSize());
- Layer dummyLayer = Layer::New();
- Stage().GetCurrent().Add(dummyLayer);
- dummyLayer.SetParentOrigin(ParentOrigin::CENTER);
-
// NOTE:
// sourceActor is a dummy delegate actor that takes the source property position,
// and generates a WORLD_POSITION, which is 1 frame behind the source property.
// Perhaps this is a bug in the way the constraint system factors into what is dirty
// and what is not.
mSourceActor = Actor::New();
- dummyLayer.Add(mSourceActor);
+ Stage().GetCurrent().Add(mSourceActor);
mSourceActor.SetParentOrigin(ParentOrigin::CENTER);
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
+ Constraint constraint = Constraint::New<Vector3>( Actor::Property::POSITION,
Source( self, mPropertySourcePosition ),
EqualToConstraint() );
mSourceActor.ApplyConstraint(constraint);
// at the end of the update cycle i.e. after constraints have been applied.)
//Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayed-source-position", Vector3::ZERO);
- constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source( mSourceActor, Actor::WORLD_POSITION ),
- CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) );
+ constraint = Constraint::New<Vector3>( Actor::Property::POSITION,
+ Source( mSourceActor, Actor::Property::WORLD_POSITION ),
+ CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) );
mCameraActor.ApplyConstraint(constraint);
// Apply constraint to render-task viewport position
- constraint = Constraint::New<Vector2>( RenderTask::VIEWPORT_POSITION,
- Source( self, Actor::WORLD_POSITION ),//mPropertySourcePosition ),
- Source( self, Actor::SIZE ),
- Source( self, Actor::WORLD_SCALE),
+ constraint = Constraint::New<Vector2>( RenderTask::Property::VIEWPORT_POSITION,
+ Source( self, Actor::Property::WORLD_POSITION ),//mPropertySourcePosition ),
+ Source( self, Actor::Property::SIZE ),
+ Source( self, Actor::Property::WORLD_SCALE ),
RenderTaskViewportPositionConstraint(stageSize) );
mTask.ApplyConstraint(constraint);
// Apply constraint to render-task viewport position
- constraint = Constraint::New<Vector2>( RenderTask::VIEWPORT_SIZE,
- Source( self, Actor::SIZE ),
- Source( self, Actor::WORLD_SCALE),
+ constraint = Constraint::New<Vector2>( RenderTask::Property::VIEWPORT_SIZE,
+ Source( self, Actor::Property::SIZE ),
+ Source( self, Actor::Property::WORLD_SCALE ),
RenderTaskViewportSizeConstraint() );
mTask.ApplyConstraint(constraint);
}
bool Magnifier::GetFrameVisibility() const
{
- return mFrameLayer;
+ return mFrame;
}
void Magnifier::SetFrameVisibility(bool visible)
{
- if(visible && !mFrameLayer)
+ if(visible && !mFrame)
{
Actor self(Self());
- Layer mFrameLayer = Layer::New();
- mFrameLayer.SetParentOrigin( ParentOrigin::CENTER );
- Stage::GetCurrent().Add(mFrameLayer);
-
- Image image = Image::New( DEFAULT_FRAME_IMAGE_PATH );
- ImageActor frame = ImageActor::New( image );
- frame.SetDrawMode(DrawMode::OVERLAY);
- frame.SetStyle( ImageActor::STYLE_NINE_PATCH );
+ Image image = ResourceImage::New( DEFAULT_FRAME_IMAGE_PATH );
+ mFrame = ImageActor::New( image );
+ mFrame.SetDrawMode(DrawMode::OVERLAY);
+ mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH );
+ mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION);
+ mFrame.SetInheritScale(true);
- frame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT );
- mFrameLayer.Add(frame);
-
- // Apply position constraint to the frame
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source( self, Actor::WORLD_POSITION ),
+ Constraint constraint = Constraint::New<Vector3>( Actor::Property::POSITION,
+ ParentSource( Actor::Property::WORLD_POSITION ),
EqualToConstraint() );
- frame.ApplyConstraint(constraint);
-
- // Apply scale constraint to the frame
- constraint = Constraint::New<Vector3>( Actor::SCALE,
- Source( self, Actor::SCALE ),
- EqualToConstraint() );
- frame.ApplyConstraint(constraint);
+ mFrame.ApplyConstraint( constraint );
- Source(self, Actor::SCALE),
+ mFrame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT );
+ self.Add(mFrame);
- // Apply size constraint to the the frame
- constraint = Constraint::New<Vector3>(Actor::SIZE,
- Source(self, Actor::SIZE),
- ImageBorderSizeConstraint());
- frame.ApplyConstraint(constraint);
+ Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f);
+ mFrame.SetSize(mActorSize + sizeOffset);
}
- else if(!visible && mFrameLayer)
+ else if(!visible && mFrame)
{
- Stage::GetCurrent().Remove(mFrameLayer);
- mFrameLayer.Reset();
+ UnparentAndReset(mFrame);
}
}
void Magnifier::OnControlSizeSet(const Vector3& targetSize)
{
+ if( mFrame )
+ {
+ Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f);
+ mFrame.SetSize(targetSize + sizeOffset);
+ }
+
// TODO: Once Camera/CameraActor properties function as proper animatable properties
// this code can disappear.
// whenever the size of the magnifier changes, the field of view needs to change
projects / platform / core / uifw / dali-toolkit.git / blobdiff