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

Update qt layout

Browse source
This commit is contained in:
Victor Shcherb 2014-11-20 18:10:17 +01:00
parent 4d8cc703f2
commit f1ef2fc31c
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/core/android/GLActivity.java
View file

@ -158,7 +158,7 @@ public class GLActivity extends Activity {
// Get device display density factor // Get device display density factor
DisplayMetrics displayMetrics = new DisplayMetrics(); DisplayMetrics displayMetrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
_displayDensityFactor = displayMetrics.densityDpi / 160.0f; _displayDensityFactor = displayMetrics.density;
_referenceTileSize = (int)(256 * _displayDensityFactor); _referenceTileSize = (int)(256 * _displayDensityFactor);
_rasterTileSize = Integer.highestOneBit(_referenceTileSize - 1) * 2; _rasterTileSize = Integer.highestOneBit(_referenceTileSize - 1) * 2;
Log.i(TAG, "displayDensityFactor = " + _displayDensityFactor); Log.i(TAG, "displayDensityFactor = " + _displayDensityFactor);

1
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -54,7 +54,6 @@ import android.view.SurfaceView;
import android.view.View; import android.view.View;
import android.view.ViewParent; import android.view.ViewParent;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.Toast; import android.widget.Toast;
public class OsmandMapTileView implements IMapDownloaderCallback { public class OsmandMapTileView implements IMapDownloaderCallback {

8
OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
View file

@ -117,7 +117,13 @@ public class NativeQtLibrary {
// DisplayMetrics displayMetrics = new DisplayMetrics(); // DisplayMetrics displayMetrics = new DisplayMetrics();
// act.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); // act.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
DisplayMetrics displayMetrics = app.getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = app.getResources().getDisplayMetrics();
float displayDensityFactor = displayMetrics.densityDpi / 160.0f; // TODO getSettings().getSettingsZoomScale() + Math.sqrt(Math.max(0, getDensity() - 1))
float scaleCoefficient = displayMetrics.density;
if (Math.min(dm.widthPixels / (dm.density * 160), dm.heightPixels / (dm.density * 160)) > 2.5f) {
// large screen
scaleCoefficient *= 1.5f;
}
float displayDensityFactor = scaleCoefficient;
int referenceTileSize = (int)(256 * displayDensityFactor); int referenceTileSize = (int)(256 * displayDensityFactor);
int rasterTileSize = Integer.highestOneBit(referenceTileSize - 1) * 2; int rasterTileSize = Integer.highestOneBit(referenceTileSize - 1) * 2;
Log.i(NATIVE_TAG, "displayDensityFactor = " + displayDensityFactor + Log.i(NATIVE_TAG, "displayDensityFactor = " + displayDensityFactor +