diff --git a/data/resource-default/default.ui b/data/resource-default/default.ui
index 08991246e6..be810dacca 100644
--- a/data/resource-default/default.ui
+++ b/data/resource-default/default.ui
@@ -1,50 +1,50 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drape_frontend/gui_skin.cpp b/drape_frontend/gui_skin.cpp
index 085ebf72a6..893b4ffcbe 100644
--- a/drape_frontend/gui_skin.cpp
+++ b/drape_frontend/gui_skin.cpp
@@ -1,10 +1,9 @@
#include "gui_skin.hpp"
#include "visual_params.hpp"
-#include "../base/string_utils.hpp"
-#include "../coding/parse_xml.hpp"
#include "../platform/platform.hpp"
-
+#include "../coding/parse_xml.hpp"
+#include "../base/string_utils.hpp"
#include "../std/function.hpp"
namespace df
@@ -85,21 +84,12 @@ public:
ASSERT(m_element == Element::Offset, ());
m_resolver.SetOffsetY(ParseFloat(value));
}
- else if (attr == "vertical")
+ else if (attr == "vertical" || attr == "horizontal")
{
if (m_element == Element::Anchor)
- m_resolver.SetAnchorVertical(ParseValueAnchor(value));
+ m_resolver.AddAnchor(ParseValueAnchor(value));
else if (m_element == Element::Relative)
- m_resolver.SetRelativeVertical(ParseValueAnchor(value));
- else
- ASSERT(false, ());
- }
- else if (attr == "horizontal")
- {
- if (m_element == Element::Anchor)
- m_resolver.SetAnchorHorizontal(ParseValueAnchor(value));
- else if (m_element == Element::Relative)
- m_resolver.SetRelativeHorizontal(ParseValueAnchor(value));
+ m_resolver.AddRelative(ParseValueAnchor(value));
else
ASSERT(false, ());
}
@@ -128,7 +118,7 @@ private:
class SkinLoader
{
public:
- SkinLoader(map > & skin)
+ explicit SkinLoader(map > & skin)
: m_skin(skin) {}
bool Push(string const & element)
@@ -237,22 +227,12 @@ GuiPosition PositionResolver::Resolve(int w, int h) const
return GuiPosition(m2::PointF(resultX, resultY), m_elementAnchor);
}
-void PositionResolver::SetAnchorVertical(dp::Anchor anchor)
+void PositionResolver::AddAnchor(dp::Anchor anchor)
{
m_elementAnchor = MergeAnchors(m_elementAnchor, anchor);
}
-void PositionResolver::SetAnchorHorizontal(dp::Anchor anchor)
-{
- m_elementAnchor = MergeAnchors(m_elementAnchor, anchor);
-}
-
-void PositionResolver::SetRelativeVertical(dp::Anchor anchor)
-{
- m_resolveAnchor = MergeAnchors(m_resolveAnchor, anchor);
-}
-
-void PositionResolver::SetRelativeHorizontal(dp::Anchor anchor)
+void PositionResolver::AddRelative(dp::Anchor anchor)
{
m_resolveAnchor = MergeAnchors(m_resolveAnchor, anchor);
}
diff --git a/drape_frontend/gui_skin.hpp b/drape_frontend/gui_skin.hpp
index fe8d32b827..25c074fafc 100644
--- a/drape_frontend/gui_skin.hpp
+++ b/drape_frontend/gui_skin.hpp
@@ -1,9 +1,8 @@
#pragma once
-#include "../coding/reader.hpp"
-
#include "../drape/drape_global.hpp"
#include "../geometry/point2d.hpp"
+#include "../coding/reader.hpp"
#include "../std/map.hpp"
@@ -23,13 +22,9 @@ struct GuiPosition
class PositionResolver
{
public:
- PositionResolver() = default;
-
GuiPosition Resolve(int w, int h) const;
- void SetAnchorVertical(dp::Anchor anchor);
- void SetAnchorHorizontal(dp::Anchor anchor);
- void SetRelativeVertical(dp::Anchor anchor);
- void SetRelativeHorizontal(dp::Anchor anchor);
+ void AddAnchor(dp::Anchor anchor);
+ void AddRelative(dp::Anchor anchor);
void SetOffsetX(float x);
void SetOffsetY(float y);
@@ -50,7 +45,7 @@ public:
Copyright
};
- GuiSkin(ReaderPtr const & reader);
+ explicit GuiSkin(ReaderPtr const & reader);
GuiPosition ResolvePosition(GuiElement name);
void Resize(int w, int h);