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

Disabled visible rect on Android

Browse source
This commit is contained in:
r.kuznetsov 2016-09-27 15:45:48 +03:00
parent e13e69a51b
commit 458da197eb
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,9 @@ void Framework::Resize(int w, int h)
{
m_contextFactory->CastFactory<AndroidOGLContextFactory>()->UpdateSurfaceSize();
m_work.OnSize(w, h);
//TODO: remove after correct visible rect calculation.
frm()->SetVisibleViewport(m2::RectD(0, 0, w, h));
}
void Framework::DetachSurface(bool destroyContext)

21
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -419,13 +419,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
processIntent(getIntent());
SharingHelper.prepare();
mVisibleRectMeasurer = new VisibleRectMeasurer(new VisibleRectListener() {
@Override
public void onVisibleRectChanged(Rect rect) {
Framework.nativeSetVisibleRect(rect.left, rect.top, rect.right, rect.bottom);
}
});
getWindow().getDecorView().addOnLayoutChangeListener(mVisibleRectMeasurer);
//TODO: uncomment after correct visible rect calculation.
//mVisibleRectMeasurer = new VisibleRectMeasurer(new VisibleRectListener() {
// @Override
// public void onVisibleRectChanged(Rect rect) {
// Framework.nativeSetVisibleRect(rect.left, rect.top, rect.right, rect.bottom);
// }
//});
//getWindow().getDecorView().addOnLayoutChangeListener(mVisibleRectMeasurer);
}
private void initViews()
@ -1158,7 +1159,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onPreviewVisibilityChanged(boolean isVisible)
{
mVisibleRectMeasurer.setPreviewVisible(isVisible);
if (mVisibleRectMeasurer != null)
mVisibleRectMeasurer.setPreviewVisible(isVisible);
if (isVisible)
{
@ -1183,7 +1185,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onPlacePageVisibilityChanged(boolean isVisible)
{
mVisibleRectMeasurer.setPlacePageVisible(isVisible);
if (mVisibleRectMeasurer != null)
mVisibleRectMeasurer.setPlacePageVisible(isVisible);
Statistics.INSTANCE.trackEvent(isVisible ? Statistics.EventName.PP_OPEN
: Statistics.EventName.PP_CLOSE);