From 9437cd65d358a05b31610daec6c3bcd154268f88 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 7 Jan 2017 16:17:05 +0100 Subject: [PATCH] fix zoom behavior of Wiki screen --- OsmAnd/src/net/osmand/plus/views/POIMapLayer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java index de2429dd1c..c44eb84f00 100644 --- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java @@ -394,16 +394,15 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null); // wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get()); - ScrollView scrollView = new ScrollView(ctx); + //For pinch zooming to work WebView must not be in side Scrollview + //ScrollView scrollView = new ScrollView(ctx); ll.addView(topBar); LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, 0); lp.weight = 1; - ll.addView(scrollView, lp); + //ll.addView(scrollView, lp); + //scrollView.addView(wv); + ll.addView(wv, 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);