Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorConstantin Shalnev <c.shalnev@corp.mail.ru>2015-08-19 17:31:37 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:01:55 +0300
commit9fe1cc12c101d60a3e10c8ce44ab35bba0ea7d68 (patch)
tree091f4df20f900cfa54bd47da133873fb846bfbb8 /map
parent487a28e33e7f2f4f4f26aeaffcdac379bfd0078b (diff)
Added background color support for software renderer
Diffstat (limited to 'map')
-rw-r--r--map/framework.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/map/framework.cpp b/map/framework.cpp
index 1dfd0838fd..4a5c2af47b 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -11,6 +11,7 @@
#ifndef USE_DRAPE
#include "render/feature_processor.hpp"
#include "render/drawer.hpp"
+ #include "render/proto_to_styles.hpp"
#else
#include "../drape_frontend/visual_params.hpp"
#endif // USE_DRAPE
@@ -315,7 +316,6 @@ void Framework::DrawSingleFrame(m2::PointD const & center, int zoomModifier,
ASSERT(rect.IsPointInside(symbols.m_searchResult), ());
}
-
int baseZoom = m_scales.GetDrawTileScale(rect);
int resultZoom = baseZoom + zoomModifier;
int const minZoom = symbols.m_bottomZoom == -1 ? resultZoom : symbols.m_bottomZoom;
@@ -326,7 +326,7 @@ void Framework::DrawSingleFrame(m2::PointD const & center, int zoomModifier,
CheckMinMaxVisibleScale(rect);
frameNavigator.SetFromRect(m2::AnyRectD(rect));
- m_cpuDrawer->BeginFrame(pxWidth, pxHeight);
+ m_cpuDrawer->BeginFrame(pxWidth, pxHeight, ConvertColor(drule::rules().GetBgColor(resultZoom)));
ScreenBase const & s = frameNavigator.Screen();
shared_ptr<PaintEvent> event = make_shared<PaintEvent>(m_cpuDrawer.get());