diff options
author | vng <viktor.govako@gmail.com> | 2013-02-18 20:21:56 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:50:59 +0300 |
commit | d5b4b401233ae86dcc10783f673909a94cf6c9b9 (patch) | |
tree | 7fac377afeec2ed8e281bbbff85f2e2d464dadcf /gui | |
parent | 4acc78d4befd8e44d3125b6ad9fce83e4a4dabb0 (diff) |
[bookmarks] Remove duplicated parameters.
Diffstat (limited to 'gui')
-rw-r--r-- | gui/balloon.cpp | 8 | ||||
-rw-r--r-- | gui/balloon.hpp | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/gui/balloon.cpp b/gui/balloon.cpp index d1b5e14c45..2f93638626 100644 --- a/gui/balloon.cpp +++ b/gui/balloon.cpp @@ -24,9 +24,7 @@ namespace gui Balloon::Balloon(Params const & p) : Element(p), - m_boundRects(1), - m_text(p.m_text), - m_image(p.m_image) + m_boundRects(1) { m_textMarginLeft = p.m_textMarginLeft; m_textMarginRight = p.m_textMarginRight; @@ -40,7 +38,7 @@ namespace gui TextView::Params tp; - tp.m_text = m_text; + tp.m_text = p.m_text; tp.m_position = graphics::EPosRight; tp.m_pivot = m2::PointD(0, 0); tp.m_depth = depth() + 1; @@ -54,7 +52,7 @@ namespace gui ip.m_pivot = m2::PointD(0, 0); ip.m_position = graphics::EPosRight; ip.m_depth = depth() + 1; - ip.m_image = m_image; + ip.m_image = p.m_image; m_imageView.reset(new ImageView(ip)); diff --git a/gui/balloon.hpp b/gui/balloon.hpp index 8f8283b3f0..41b70fc989 100644 --- a/gui/balloon.hpp +++ b/gui/balloon.hpp @@ -22,7 +22,12 @@ namespace gui { class Balloon : public Element { + protected: + scoped_ptr<TextView> m_textView; + private: + scoped_ptr<ImageView> m_imageView; + scoped_ptr<graphics::DisplayList> m_displayList; typedef function<void (Element *)> TOnClickListener; @@ -32,13 +37,6 @@ namespace gui void purge(); void layout(); - scoped_ptr<TextView> m_textView; - scoped_ptr<ImageView> m_imageView; - scoped_ptr<graphics::DisplayList> m_displayList; - - string m_text; - graphics::Image::Info m_image; - double m_textMarginLeft; double m_textMarginTop; double m_textMarginRight; |