mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed compilation on Linux

Browse source
This commit is contained in:
r.kuznetsov 2015-09-14 12:22:58 +03:00
parent 5b6e34fbdf
commit 5e9219293d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/gui/drape_gui.cpp
View file

@ -56,9 +56,16 @@ void DrapeGui::Destroy()
void DrapeGui::SetSurfaceSize(m2::PointF const & size)
{
lock_guard<mutex> lock(m_surfaceSizeMutex);
m_surfaceSize = size;
}
m2::PointF DrapeGui::GetSurfaceSize() const
{
lock_guard<mutex> lock(m_surfaceSizeMutex);
return m_surfaceSize;
}
void DrapeGui::SetLocalizator(const DrapeGui::TLocalizeStringFn & fn)
{
ASSERT(m_impl != nullptr, ());

7
drape_frontend/gui/drape_gui.hpp
View file

@ -11,7 +11,7 @@
#include "std/function.hpp"
#include "std/unique_ptr.hpp"
#include "std/atomic.hpp"
#include "std/mutex.hpp"
class ScreenBase;
@ -36,7 +36,7 @@ public:
void SetLocalizator(TLocalizeStringFn const & fn);
void Destroy();
void SetSurfaceSize(m2::PointF const & size);
m2::PointF GetSurfaceSize() const { return m_surfaceSize; }
m2::PointF GetSurfaceSize() const;
string GetLocalizedString(string const & stringID) const;
@ -69,7 +69,8 @@ private:
Shape::TTapHandler m_onCompassTappedHandler;
CountryStatus::TButtonHandlers m_buttonHandlers;
atomic<m2::PointF> m_surfaceSize;
m2::PointF m_surfaceSize;
mutable mutex m_surfaceSizeMutex;
bool m_inUserAction = false;
};