xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename theme property base-text-size -> base-text-scale

Browse Source
This commit is contained in:
Hannes Janetzek 2014-06-02 10:42:58 +02:00
parent fb628f4e25
commit 7667b08b50
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtm/src/org/oscim/theme/XmlThemeBuilder.java
View File

@ -138,7 +138,7 @@ public class XmlThemeBuilder extends DefaultHandler {
private int mLevels = 0; private int mLevels = 0;
private int mMapBackground = 0xffffffff; private int mMapBackground = 0xffffffff;
private float mBaseTextSize = 1; private float mTextScale = 1;
private RenderTheme mRenderTheme; private RenderTheme mRenderTheme;
@ -149,7 +149,7 @@ public class XmlThemeBuilder extends DefaultHandler {
for (int i = 0, n = rules.length; i < n; i++) for (int i = 0, n = rules.length; i < n; i++)
rules[i] = mRulesList.get(i).onComplete(null); rules[i] = mRulesList.get(i).onComplete(null);
mRenderTheme = new RenderTheme(mMapBackground, mBaseTextSize, rules, mLevels); mRenderTheme = new RenderTheme(mMapBackground, mTextScale, rules, mLevels);
mRulesList.clear(); mRulesList.clear();
mStyles.clear(); mStyles.clear();
@ -658,7 +658,7 @@ public class XmlThemeBuilder extends DefaultHandler {
Integer version = null; Integer version = null;
int mapBackground = Color.WHITE; int mapBackground = Color.WHITE;
float baseStrokeWidth = 1; float baseStrokeWidth = 1;
float baseTextSize = 1; float baseTextScale = 1;
for (int i = 0; i < attributes.getLength(); ++i) { for (int i = 0; i < attributes.getLength(); ++i) {
String name = attributes.getLocalName(i); String name = attributes.getLocalName(i);
@ -676,8 +676,8 @@ public class XmlThemeBuilder extends DefaultHandler {
else if ("base-stroke-width".equals(name)) else if ("base-stroke-width".equals(name))
baseStrokeWidth = Float.parseFloat(value); baseStrokeWidth = Float.parseFloat(value);
else if ("base-text-size".equals(name)) else if ("base-text-scale".equals(name))
baseTextSize = Float.parseFloat(value); baseTextScale = Float.parseFloat(value);
else else
XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i); XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
@ -691,10 +691,10 @@ public class XmlThemeBuilder extends DefaultHandler {
+ version); + version);
validateNonNegative("base-stroke-width", baseStrokeWidth); validateNonNegative("base-stroke-width", baseStrokeWidth);
validateNonNegative("base-test-size", baseTextSize); validateNonNegative("base-text-scale", baseTextScale);
mMapBackground = mapBackground; mMapBackground = mapBackground;
mBaseTextSize = baseTextSize; mTextScale = baseTextScale;
} }
/** /**