diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2013-01-31 17:25:38 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:49:35 +0300 |
| commit | d1fbb8ab5ba210cb6ae3bf90680007c01d3c4c16 (patch) | |
| tree | 174ebddb28fd54f1b22c7c844af7b4767245d14d /gui | |
| parent | da55e60f02d06702b5ea96f6a018ee4d8603c0c9 (diff) | |
fixed default constructors for all OverlayElements.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/balloon.cpp | 9 | ||||
| -rw-r--r-- | gui/text_view.cpp | 1 | ||||
| -rw-r--r-- | gui/text_view.hpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/gui/balloon.cpp b/gui/balloon.cpp index a32583257b..0f3b188eb8 100644 --- a/gui/balloon.cpp +++ b/gui/balloon.cpp @@ -11,6 +11,15 @@ namespace gui { Balloon::Params::Params() + : m_image(), + m_textMarginLeft(10), + m_textMarginTop(10), + m_textMarginRight(10), + m_textMarginBottom(10), + m_imageMarginLeft(10), + m_imageMarginTop(10), + m_imageMarginRight(10), + m_imageMarginBottom(10) {} Balloon::Balloon(Params const & p) diff --git a/gui/text_view.cpp b/gui/text_view.cpp index 6e14ca06e1..cec1b7d882 100644 --- a/gui/text_view.cpp +++ b/gui/text_view.cpp @@ -37,6 +37,7 @@ namespace gui shared_ptr<graphics::StraightTextElement> & elem = m_elems[state]; graphics::StraightTextElement::Params params; + params.m_depth = depth(); params.m_fontDesc = font(state); params.m_fontDesc.m_size *= visualScale(); diff --git a/gui/text_view.hpp b/gui/text_view.hpp index 055ccebf1c..a485722ec0 100644 --- a/gui/text_view.hpp +++ b/gui/text_view.hpp @@ -32,7 +32,7 @@ namespace gui void purge(); void layout(); - struct Params : public gui::Element::Params + struct Params : public Element::Params { string m_text; }; |