Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrachytski <siarhei.rachytski@gmail.com>2013-01-25 13:25:44 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:49:21 +0300
commit2bf7adf129911da7d2f6a41aca07ecefd006743b (patch)
treedc0d5fba8839cbdaba348e479ac8c59c7ecfd7f2 /map/ruler.hpp
parent8dd89a8fce7a1b357c7aa5333893d3a0c587a9b5 (diff)
refactored Ruler to make it gui::Element.
Diffstat (limited to 'map/ruler.hpp')
-rw-r--r--map/ruler.hpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/map/ruler.hpp b/map/ruler.hpp
index f6b03d97d4..13fca1b769 100644
--- a/map/ruler.hpp
+++ b/map/ruler.hpp
@@ -1,9 +1,9 @@
#pragma once
+#include "../gui/element.hpp"
#include "../geometry/screenbase.hpp"
#include "../geometry/point2d.hpp"
#include "../geometry/any_rect2d.hpp"
-#include "../graphics/overlay_element.hpp"
#include "../graphics/font_desc.hpp"
namespace graphics
@@ -15,7 +15,7 @@ namespace graphics
}
}
-class Ruler : public graphics::OverlayElement
+class Ruler : public gui::Element
{
private:
@@ -44,7 +44,7 @@ private:
m2::RectD m_boundRect;
- typedef OverlayElement base_t;
+ typedef gui::Element base_t;
mutable vector<m2::AnyRectD> m_boundRects;
@@ -60,9 +60,7 @@ private:
public:
void update(); //< update internal params after some other params changed.
- struct Params : public base_t::Params
- {
- };
+ typedef base_t::Params Params;
Ruler(Params const & p);
void setup();