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

Merge pull request #6075 from osmandapp/UiImprovements

Browse source 
Fix points text size on map
This commit is contained in:
Alexander Sytnyk 2018-09-21 13:18:11 +03:00 committed by GitHub
commit 65394fe32a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/views/MapTextLayer.java
View file

@ -22,6 +22,7 @@ public class MapTextLayer extends OsmandMapLayer {
private static final int TEXT_WRAP = 15;
private static final int TEXT_LINES = 3;
private static final int TEXT_SIZE = 13;
private Map<OsmandMapLayer, Collection<?>> textObjects = new LinkedHashMap<>();
private Paint paintTextIcon;
@ -62,6 +63,7 @@ public class MapTextLayer extends OsmandMapLayer {
continue;
}
updateTextSize();
paintTextIcon.setFakeBoldText(provider.isFakeBoldText());
for (Object o : textObjects.get(l)) {
LatLon loc = provider.getTextLocation(o);
@ -158,7 +160,7 @@ public class MapTextLayer extends OsmandMapLayer {
public void initLayer(OsmandMapTileView v) {
this.view = v;
paintTextIcon = new Paint();
paintTextIcon.setTextSize(13 * v.getDensity());
updateTextSize();
paintTextIcon.setTextAlign(Align.CENTER);
paintTextIcon.setAntiAlias(true);
Map<OsmandMapLayer, Collection<?>> textObjectsLoc = new TreeMap<>(new Comparator<OsmandMapLayer>() {
@ -188,4 +190,12 @@ public class MapTextLayer extends OsmandMapLayer {
public boolean drawInScreenPixels() {
return true;
}
private void updateTextSize() {
float scale = view.getApplication().getSettings().TEXT_SCALE.get();
float textSize = scale * TEXT_SIZE * view.getDensity();
if (paintTextIcon.getTextSize() != textSize) {
paintTextIcon.setTextSize(textSize);
}
}
}