From 2183f837071e71698346d95bb74d1786be564a0f Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 7 Jan 2017 15:51:16 +0100 Subject: [PATCH] Add TODO comment about pinc-zooming in ScrollView --- OsmAnd/src/net/osmand/plus/views/POIMapLayer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java index 5cf4e36360..de2429dd1c 100644 --- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java @@ -370,9 +370,9 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon WebSettings settings = wv.getSettings(); settings.setDefaultTextEncodingName("utf-8"); - //Zooming does not work ok here - settings.setBuiltInZoomControls(false); + settings.setBuiltInZoomControls(true); settings.setDisplayZoomControls(false); + settings.setSupportZoom(true); //Scale web view font size with system font size float scale = ctx.getResources().getConfiguration().fontScale; @@ -400,7 +400,10 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon lp.weight = 1; ll.addView(scrollView, lp); ll.addView(bottomBar, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); + + //TODO: ScrollView gets in the way of the pinch gesture here, take wv outside scrollView.addView(wv); + dialog.setContentView(ll); wv.setFocusable(true); wv.setFocusableInTouchMode(true);