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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-12-29 10:12:51 +03:00
parent b42af2876d
commit e840239e80
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape_frontend/gui/layer_render.cpp
View file

@ -46,7 +46,7 @@ void LayerRenderer::Merge(ref_ptr<LayerRenderer> other)
if (it != m_renderers.end())
{
it->second = move(r.second);
if (m_activeOverlay != nullptr && m_activeOverlayRenderer == r.first)
if (m_activeOverlay != nullptr && m_activeOverlayWidget == r.first)
{
m_activeOverlay->OnTapEnd();
m_activeOverlay = nullptr;
@ -91,7 +91,7 @@ bool LayerRenderer::OnTouchDown(m2::RectD const & touchArea)
m_activeOverlay = r.second->ProcessTapEvent(touchArea);
if (m_activeOverlay != nullptr)
{
m_activeOverlayRenderer = r.first;
m_activeOverlayWidget = r.first;
m_activeOverlay->OnTapBegin();
return true;
}

2
drape_frontend/gui/layer_render.hpp
View file

@ -46,7 +46,7 @@ private:
TRenderers m_renderers;
ref_ptr<gui::Handle> m_activeOverlay;
EWidget m_activeOverlayRenderer = EWidget::WIDGET_RULER;
EWidget m_activeOverlayWidget = EWidget::WIDGET_RULER;
};
class LayerCacher