diff options
author | ExMix <rahuba.youri@mapswithme.com> | 2014-06-18 12:23:09 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:17:13 +0300 |
commit | 9bc3aef6276a78f05148f18717d27f1cda99ed5f (patch) | |
tree | 7193dfa5d45f623c10c1c953dc3703f9549ecd0b /gui | |
parent | eaaaffa8f047c7c188fb72cff9b0b6a6b9ce9425 (diff) |
[core] remove useless code
Diffstat (limited to 'gui')
-rw-r--r-- | gui/gui.pro | 2 | ||||
-rw-r--r-- | gui/gui_tests/gui_tests.cpp | 51 |
2 files changed, 0 insertions, 53 deletions
diff --git a/gui/gui.pro b/gui/gui.pro index 571ee1679a..725de88b88 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -13,7 +13,6 @@ HEADERS += \ element.hpp \ button.hpp \ text_view.hpp \ - balloon.hpp \ image_view.hpp \ cached_text_view.hpp \ display_list_cache.hpp @@ -23,7 +22,6 @@ SOURCES += \ element.cpp \ button.cpp \ text_view.cpp \ - balloon.cpp \ image_view.cpp \ cached_text_view.cpp \ display_list_cache.cpp diff --git a/gui/gui_tests/gui_tests.cpp b/gui/gui_tests/gui_tests.cpp index 36cda40ec0..8f10444e53 100644 --- a/gui/gui_tests/gui_tests.cpp +++ b/gui/gui_tests/gui_tests.cpp @@ -1,6 +1,5 @@ #include "../../qt_tstfrm/gui_test_widget.hpp" -#include "../balloon.hpp" #include "../button.hpp" #include "../text_view.hpp" #include "../image_view.hpp" @@ -8,55 +7,6 @@ #include "../../map/country_status_display.hpp" - -struct BalloonTest -{ - shared_ptr<gui::Balloon> m_balloon; - - bool m_flag; - - void Init(gui::Controller * c) - { - m_flag = false; - gui::Balloon::Params bp; - - bp.m_depth = graphics::maxDepth - 20; - bp.m_pivot = m2::PointD(200, 200); - bp.m_position = graphics::EPosAbove; - - bp.m_mainText = "Active"; - bp.m_auxText = "Very very very very very very very very very very very very very very long"; - bp.m_image = graphics::Image::Info("plus.png", graphics::EDensityMDPI); - - m_balloon.reset(new gui::Balloon(bp)); - m_balloon->setIsVisible(true); - - m_balloon->setOnClickListener(bind(&BalloonTest::OnClick, this, _1)); - - c->AddElement(m_balloon); - } - - void OnClick(gui::Element * e) - { - gui::Balloon * b = static_cast<gui::Balloon *>(e); - - SetText(b); - - m_flag = !m_flag; - } - - void SetText(gui::Balloon * b) - { - if (m_flag) - b->setText("Arrow", "Very very very very very very very very very very very very very very long"); - else - b->setText("Very very very very very very very very very very very very very very long", "Arrow"); - } - - void DoDraw(shared_ptr<graphics::Screen> const & p) - {} -}; - struct ButtonTest { shared_ptr<gui::Button> m_button; @@ -203,7 +153,6 @@ struct CountryStatusDisplayTest } }; -UNIT_TEST_GUI(BalloonTest); //UNIT_TEST_GUI(ButtonTest); //UNIT_TEST_GUI(TextViewTest); //UNIT_TEST_GUI(ImageViewTest); |