X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fmagnifier%2Fmagnifier-impl.cpp;h=597a4c2a7a545e05086e91df2a8bd930fca3d7b1;hb=680c5587a1478717393d3a03cf6a17801edd00e0;hp=02e28d81b6da620ac3cbe15f64a451c7fb0e5334;hpb=a881757839b7abb008873a68c67e17b3ba39669b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index 02e28d8..597a4c2 100644 --- a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -15,8 +15,15 @@ * */ +// CLASS HEADER #include +// EXTERNAL INCLUDES +#include +#include +#include +#include + using namespace Dali; namespace // unnamed namespace @@ -115,22 +122,6 @@ struct RenderTaskViewportSizeConstraint } }; -/** - * 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 @@ -162,7 +153,7 @@ Dali::Toolkit::Magnifier Magnifier::New() } Magnifier::Magnifier() -: ControlImpl(true), +: Control( REQUIRES_TOUCH_EVENTS ), mPropertySourcePosition(Property::INVALID_INDEX), mActorSize(Vector3::ZERO), mMagnificationFactor(1.0f)