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

Fixed crash in overlay tree, fixed compilation issue on iOS

Browse source
This commit is contained in:
r.kuznetsov 2015-10-13 15:30:22 +03:00
parent 44e21af4a4
commit e94937437d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drape_frontend/render_group.cpp
View file

@ -45,6 +45,9 @@ void RenderGroup::Update(ScreenBase const & modelView)
void RenderGroup::CollectOverlay(ref_ptr<dp::OverlayTree> tree)
{
if (m_pendingOnDelete)
return;
for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
renderBucket->CollectOverlayHandles(tree, GetOpacity() < 1.0);
}

2
iphone/Maps/Classes/EAGLView.mm
View file

@ -126,7 +126,7 @@ graphics::EDensity getDensityType(int exactDensityDPI, double scale)
p.m_widgetsInitInfo[widget] = pos;
});
p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABLE] = gui::Position(dp::LeftBottom);
p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABEL] = gui::Position(dp::LeftBottom);
GetFramework().CreateDrapeEngine(make_ref<dp::OGLContextFactory>(m_factory), move(p));