pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-09-08 13:02:27 +03:00
parent d1ec2d1e32
commit 5735727490
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape_frontend/animation/model_view_animation.hpp
View file

@ -49,6 +49,8 @@ private:
class FixedPointAnimation : public ModelViewAnimation
{
public:
/// This animation extends ModelViewAnimation by adding point which must be in certain
/// pixel position on the screen.
FixedPointAnimation(m2::AnyRectD const & startRect, m2::AnyRectD const & endRect,
double aDuration, double mDuration, double sDuration,
m2::PointD const & pixelPoint, m2::PointD const & globalPoint);

2
drape_frontend/my_position_controller.cpp
View file

@ -477,7 +477,9 @@ void MyPositionController::Follow()
{
location::EMyPositionMode currentMode = GetMode();
if (currentMode == location::MODE_FOLLOW)
{
ChangeModelView(m_position);
}
else if (currentMode == location::MODE_ROTATE_AND_FOLLOW)
{
bool animate = true;

1
drape_frontend/user_event_stream.hpp
View file

@ -244,6 +244,7 @@ private:
void BeginDrag(Touch const & t, double timestamp);
void Drag(Touch const & t, double timestamp);
// EndDrag returns false in case of kinetic moving after dragging has begun.
bool EndDrag(Touch const & t, double timestamp, bool cancelled);
void BeginScale(Touch const & t1, Touch const & t2);