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

[drape] tempotaty code for android part layout dynamic widgets

Browse source
This commit is contained in:
ExMix 2015-06-12 16:07:53 +03:00 • committed by r.kuznetsov
parent e97ede0212
commit b7ca2b9103
3 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -146,9 +146,24 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
return false;
float visualScale = GetBestDensity(densityDpi);
m_work.CreateDrapeEngine(make_ref(m_contextFactory), visualScale, factory->GetWidth(), factory->GetHeight());
::Framework::DrapeCreationParams p;
p.m_surfaceWidth = factory->GetWidth();
p.m_surfaceHeight = factory->GetHeight();
p.m_visualScale = visualScale;
/// @TODO (iOS developers) remove this stuff and create real logic for init and layout core widgets
m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("default"), visualScale));
m_skin->Resize(p.m_surfaceWidth, p.m_surfaceHeight);
m_skin->ForEach([&p](gui::EWidget widget, gui::Position const & pos)
{
p.m_widgetsInitInfo[widget] = pos;
});
p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABLE] = gui::Position(dp::LeftBottom);
m_work.CreateDrapeEngine(make_ref(m_contextFactory), move(p));
m_work.EnterForeground();
LoadState();
m_work.LoadBookmarks();
m_work.SetMyPositionModeListener(bind(&Framework::MyPositionModeChanged, this, _1));
@ -165,6 +180,20 @@ void Framework::Resize(int w, int h)
{
m_contextFactory->CastFactory<AndroidOGLContextFactory>()->UpdateSurfaceSize();
m_work.OnSize(w, h);
/// @TODO (iOS developers) remove this stuff and create real logic for layout core widgets
if (m_skin)
{
m_skin->Resize(w, h);
gui::TWidgetsLayoutInfo layout;
m_skin->ForEach([&layout](gui::EWidget w, gui::Position const & pos)
{
layout[w] = pos.m_pixelPivot;
});
m_work.SetWidgetLayout(move(layout));
}
}
void Framework::SetMapStyle(MapStyle mapStyle)
@ -318,11 +347,6 @@ void Framework::SaveState()
m_work.SaveState();
}
void Framework::SetupMeasurementSystem()
{
m_work.SetupMeasurementSystem();
}
void Framework::AddLocalMaps()
{
m_work.RegisterAllMaps();

6
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -6,6 +6,8 @@
#include "search/result.hpp"
#include "drape_gui/skin.hpp"
#include "drape/pointers.hpp"
#include "drape/oglcontextfactory.hpp"
@ -32,6 +34,8 @@ namespace android
drape_ptr<dp::ThreadSafeFactory> m_contextFactory;
::Framework m_work;
unique_ptr<gui::Skin> m_skin;
typedef shared_ptr<jobject> TJobject;
TJobject m_javaCountryListener;
@ -104,8 +108,6 @@ namespace android
void LoadState();
void SaveState();
void SetupMeasurementSystem();
void AddLocalMaps();
void RemoveLocalMaps();

1
android/jni/com/mapswithme/maps/settings/UnitLocale.cpp
View file

@ -10,7 +10,6 @@ extern "C"
{
Settings::Units const u = static_cast<Settings::Units>(units);
Settings::Set("Units", u);
g_framework->SetupMeasurementSystem();
}
JNIEXPORT jint JNICALL