Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix zoom behavior of Wiki screen

Browse source
This commit is contained in:
sonora 2017-01-07 16:17:05 +01:00
parent f1b60d2f85
commit 9437cd65d3
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -394,16 +394,15 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null); wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null);
// wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get()); // 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); ll.addView(topBar);
LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, 0); LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, 0);
lp.weight = 1; 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)); 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); dialog.setContentView(ll);
wv.setFocusable(true); wv.setFocusable(true);
wv.setFocusableInTouchMode(true); wv.setFocusableInTouchMode(true);