diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2014-10-08 11:43:06 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:29:38 +0300 |
| commit | e931bb160041774f98da8be98201f4c6d17f84b1 (patch) | |
| tree | 37d340a825e9a96fe17869a957814a0f2337431f /gui | |
| parent | b0a390f1943873f12153e7bf0282198e9bc0ff43 (diff) | |
[core] new download buttons from map view
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/button.cpp | 1 | ||||
| -rw-r--r-- | gui/button.hpp | 3 | ||||
| -rw-r--r-- | gui/gui_tests/gui_tests.cpp | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/gui/button.cpp b/gui/button.cpp index 0a07590aa7..d5e3e32fa0 100644 --- a/gui/button.cpp +++ b/gui/button.cpp @@ -1,6 +1,5 @@ #include "button.hpp" #include "controller.hpp" -#include "text_view.hpp" #include "../graphics/screen.hpp" #include "../graphics/display_list.hpp" diff --git a/gui/button.hpp b/gui/button.hpp index 785f15bcdb..9f404ba1cd 100644 --- a/gui/button.hpp +++ b/gui/button.hpp @@ -1,6 +1,7 @@ #pragma once #include "element.hpp" +#include "text_view.hpp" #include "../std/function.hpp" #include "../std/string.hpp" @@ -20,8 +21,6 @@ namespace graphics namespace gui { - class TextView; - class Button : public Element { public: diff --git a/gui/gui_tests/gui_tests.cpp b/gui/gui_tests/gui_tests.cpp index 089ad19954..f4680bd5d7 100644 --- a/gui/gui_tests/gui_tests.cpp +++ b/gui/gui_tests/gui_tests.cpp @@ -8,6 +8,7 @@ #include "../../graphics/display_list.hpp" #include "../../map/country_status_display.hpp" +#include "../../map/framework.hpp" struct ButtonTest @@ -129,24 +130,23 @@ struct ImageViewTest struct CountryStatusDisplayTest { shared_ptr<CountryStatusDisplay> m_countryStatus; - shared_ptr<storage::Storage> m_storage; + shared_ptr<Framework> m_framework; m2::PointD m_pivot; void Init(gui::Controller * c) { - CountryStatusDisplay::Params p; + CountryStatusDisplay::Params p(m_framework->GetCountryTree().GetActiveMapLayout()); m_pivot = m2::PointD(400, 400); - m_storage.reset(new storage::Storage()); + m_framework.reset(new Framework()); p.m_depth = graphics::maxDepth; p.m_pivot = m_pivot; p.m_position = graphics::EPosAboveLeft; - p.m_storage = m_storage.get(); m_countryStatus.reset(new CountryStatusDisplay(p)); - m_countryStatus->setCountryIndex(storage::TIndex(1, 1, 1)); + m_countryStatus->SetCountryIndex(storage::TIndex(1, 1, 1)); m_countryStatus->setPivot(m_pivot); c->AddElement(m_countryStatus); } |