kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

review fixes

Browse source
This commit is contained in:
ExMix 2015-08-28 14:26:47 +03:00 • committed by r.kuznetsov
parent 96481aa101
commit 002181a960
6 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -248,7 +248,7 @@ TStatus Framework::GetCountryStatus(TIndex const & idx) const
return m_work.GetCountryStatus(idx);
}
void Framework::Touch(int action, Finger f1, Finger f2, uint8_t maskedPointer)
void Framework::Touch(int action, Finger const & f1, Finger const & f2, uint8_t maskedPointer)
{
MultiTouchAction eventType = static_cast<MultiTouchAction>(action);
df::TouchEvent event;

2
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -113,7 +113,7 @@ namespace android
float m_x, m_y;
};
void Touch(int action, Finger f1, Finger f2, uint8_t maskedPointer);
void Touch(int action, Finger const & f1, Finger const & f2, uint8_t maskedPointer);
/// Show rect from another activity. Ensure that no LoadState will be called,
/// when main map activity will become active.

2
drape_frontend/kinetic_scroller.cpp
View file

@ -51,7 +51,7 @@ void KineticScroller::InitGrab(ScreenBase const & modelView, double timeStamp)
m_lastRect = modelView.GlobalRect();
}
bool KineticScroller::IsActive()
bool KineticScroller::IsActive() const
{
return m_lastTimestamp > 0.0;
}

2
drape_frontend/kinetic_scroller.hpp
View file

@ -13,7 +13,7 @@ public:
KineticScroller();
void InitGrab(ScreenBase const & modelView, double timeStamp);
bool IsActive();
bool IsActive() const;
void GrabViewRect(ScreenBase const & modelView, double timeStamp);
void CancelGrab();
unique_ptr<BaseModelViewAnimation> CreateKineticAnimation(ScreenBase const & modelView);

15
drape_frontend/user_event_stream.cpp
View file

@ -30,11 +30,6 @@ size_t GetValidTouchesCount(array<Touch, 2> const & touches)
return result;
}
int8_t toInt(bool v)
{
return v == true ? 1 : 0;
}
} // namespace
#ifdef DEBUG
@ -57,9 +52,7 @@ uint8_t const TouchEvent::INVALID_MASKED_POINTER = 0xFF;
void TouchEvent::PrepareTouches(array<Touch, 2> const & previousToches)
{
size_t validCount = GetValidTouchesCount(m_touches);
size_t prevValidCount = GetValidTouchesCount(previousToches);
if (validCount == 2 && prevValidCount > 0)
if (GetValidTouchesCount(m_touches) == 2 && GetValidTouchesCount(previousToches) > 0)
{
if (previousToches[0].m_id == m_touches[1].m_id)
Swap();
@ -89,8 +82,8 @@ uint8_t TouchEvent::GetSecondMaskedPointer() const
size_t TouchEvent::GetMaskedCount()
{
return toInt(GetFirstMaskedPointer() != INVALID_MASKED_POINTER) +
toInt(GetSecondMaskedPointer() != INVALID_MASKED_POINTER);
return static_cast<int>(GetFirstMaskedPointer() != INVALID_MASKED_POINTER) +
static_cast<int>(GetSecondMaskedPointer() != INVALID_MASKED_POINTER);
}
void TouchEvent::Swap()
@ -100,7 +93,7 @@ void TouchEvent::Swap()
if (index == INVALID_MASKED_POINTER)
return index;
return my::cyclicClamp(index + 1, 0, 1);
return index ^ 0x1;
};
swap(m_touches[0], m_touches[1]);

2
drape_frontend/user_event_stream.hpp
View file

@ -57,7 +57,7 @@ struct TouchEvent
/// and GetFirstMaskedPointer return index of this pointer in m_touces (0 in this case)
/// Than user put down second finger. m_touches will have 2 valid elements, but new finger only one.
/// In this case GetFirstMaskedPointer returns index of new pointer.
/// If user put down both fingers than GetFirst and GetSecond
/// If user put down both fingers simultaneously, then GetFirst and GetSecond
/// will return valid not equal INVALID_MASKED_POINTER
void SetFirstMaskedPointer(uint8_t firstMask);
uint8_t GetFirstMaskedPointer() const;