Mercurial > hg > orthanc-stone
diff Framework/Scene2D/Internals/FixedPointAligner.h @ 860:238693c3bc51 am-dev
merge default -> am-dev
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 24 Jun 2019 14:35:00 +0200 |
parents | e42b491f1fb2 |
children | 2d8ab34c8c91 |
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/FixedPointAligner.h Wed Jun 19 17:36:33 2019 +0200 +++ b/Framework/Scene2D/Internals/FixedPointAligner.h Mon Jun 24 14:35:00 2019 +0200 @@ -20,24 +20,24 @@ #pragma once -#include <Framework/Scene2DViewport/PointerTypes.h> -#include <Framework/Scene2D/ScenePoint2D.h> +#include "../../Scene2DViewport/PredeclaredTypes.h" +#include "../../Scene2D/ScenePoint2D.h" namespace OrthancStone { namespace Internals { // During a mouse event that modifies the view of a scene, keeps - // one point (the pivot) at the same position on the canvas + // one point (the pivot) at a fixed position on the canvas class FixedPointAligner : public boost::noncopyable { private: - ViewportControllerWPtr controllerW_; + boost::weak_ptr<ViewportController> controllerW_; ScenePoint2D pivot_; ScenePoint2D canvas_; public: - FixedPointAligner(ViewportControllerWPtr controllerW, + FixedPointAligner(boost::weak_ptr<ViewportController> controllerW, const ScenePoint2D& p); void Apply();