diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-07-26 00:06:53 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-07-29 15:55:14 +0300 |
| commit | f2d29df6a6029d6d5cf9233fee21f2f579fa585d (patch) | |
| tree | fa7e2fdbe79abae9d90a101b53a949fe9b6a1e8e | |
| parent | 51affeb93d9c351ffa8faf9cc314ddcd0fcf8fd4 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-font_fallback.tar.gz | |
| -rw-r--r-- | platform/qt/src/local_glyph_rasterizer.cpp | 14 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_map_renderer.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/platform/qt/src/local_glyph_rasterizer.cpp b/platform/qt/src/local_glyph_rasterizer.cpp index 3f8df5d876..a2eb80f3b4 100644 --- a/platform/qt/src/local_glyph_rasterizer.cpp +++ b/platform/qt/src/local_glyph_rasterizer.cpp @@ -11,18 +11,18 @@ namespace mbgl { class LocalGlyphRasterizer::Impl { public: - Impl(const optional<std::string> fontFamily_); + Impl(optional<std::vector<std::string>> fontFamily_); bool isConfigured() const; - optional<std::string> fontFamily; + optional<std::vector<std::string>> fontFamily; QFont font; }; -LocalGlyphRasterizer::Impl::Impl(const optional<std::string> fontFamily_) - : fontFamily(fontFamily_) { +LocalGlyphRasterizer::Impl::Impl(optional<std::vector<std::string>> fontFamily_) + : fontFamily(std::move(fontFamily_)) { if (isConfigured()) { - font.setFamily(QString::fromStdString(*fontFamily)); + font.setFamily(QString::fromStdString((*fontFamily)[0])); font.setPixelSize(24); } } @@ -31,8 +31,8 @@ bool LocalGlyphRasterizer::Impl::isConfigured() const { return fontFamily.operator bool(); } -LocalGlyphRasterizer::LocalGlyphRasterizer(const optional<std::string> fontFamily) - : impl(std::make_unique<Impl>(fontFamily)) { +LocalGlyphRasterizer::LocalGlyphRasterizer(optional<std::vector<std::string>> fontFamily) + : impl(std::make_unique<Impl>(std::move(fontFamily))) { } LocalGlyphRasterizer::~LocalGlyphRasterizer() { diff --git a/platform/qt/src/qmapboxgl_map_renderer.cpp b/platform/qt/src/qmapboxgl_map_renderer.cpp index eba50af6bf..dc5599ec1d 100644 --- a/platform/qt/src/qmapboxgl_map_renderer.cpp +++ b/platform/qt/src/qmapboxgl_map_renderer.cpp @@ -29,7 +29,7 @@ static auto *getScheduler() { QMapboxGLMapRenderer::QMapboxGLMapRenderer(qreal pixelRatio, QMapboxGLSettings::GLContextMode mode, const QString &localFontFamily) : m_backend(static_cast<mbgl::gfx::ContextMode>(mode)), m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, mbgl::optional<std::string> {}, - localFontFamily.isEmpty() ? mbgl::nullopt : mbgl::optional<std::string> { localFontFamily.toStdString() })) + localFontFamily.isEmpty() ? mbgl::nullopt : mbgl::optional<std::vector<std::string>>{{ localFontFamily.toStdString() }})) , m_forceScheduler(needsToForceScheduler()) { // If we don't have a Scheduler on this thread, which |