diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2018-02-09 15:44:57 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2018-02-15 11:12:21 +0300 |
| commit | 22246364a0ea21b77542002a068831c443edf66d (patch) | |
| tree | 91c2e1741286b92de54c75cf6aeae8bc017d0a73 /qt | |
| parent | b4b7851da38df2fd67a8058cbd792f4c6dc96126 (diff) | |
Desktop fixes.
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/draw_widget.cpp | 8 | ||||
| -rw-r--r-- | qt/qt_common/map_widget.hpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 7999667147..9827ecb051 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -370,12 +370,10 @@ void DrawWidget::SubmitRoutingPoint(m2::PointD const & pt) void DrawWidget::SubmitBookmark(m2::PointD const & pt) { - size_t categoryIndex = 0; - auto category = m_framework.GetBookmarkManager().GetBmCategory(categoryIndex); - if (category == nullptr) - categoryIndex = m_framework.GetBookmarkManager().CreateBmCategory("Desktop_bookmarks"); + if (!m_framework.GetBookmarkManager().HasBmCategory(m_bookmarksCategoryId)) + m_bookmarksCategoryId = m_framework.GetBookmarkManager().CreateBookmarkCategory("Desktop_bookmarks"); BookmarkData data("", "placemark-red"); - m_framework.GetBookmarkManager().AddBookmark(categoryIndex, m_framework.P3dtoG(pt), data); + m_framework.GetBookmarkManager().GetEditSession().CreateBookmark(m_framework.P3dtoG(pt), data, m_bookmarksCategoryId); } void DrawWidget::FollowRoute() diff --git a/qt/qt_common/map_widget.hpp b/qt/qt_common/map_widget.hpp index a238532e88..846bb4e9f2 100644 --- a/qt/qt_common/map_widget.hpp +++ b/qt/qt_common/map_widget.hpp @@ -3,6 +3,7 @@ #include "drape/pointers.hpp" #include "drape_frontend/gui/skin.hpp" #include "drape_frontend/user_event_stream.hpp" +#include <drape_frontend/user_marks_global.hpp> #include "qt/qt_common/qtoglcontextfactory.hpp" #include <QtCore/QTimer> @@ -86,6 +87,7 @@ protected: bool m_apiOpenGLES3; ScaleSlider * m_slider; SliderState m_sliderState; + df::MarkGroupID m_bookmarksCategoryId = 0; qreal m_ratio; drape_ptr<QtOGLContextFactory> m_contextFactory; |