diff options
| -rwxr-xr-x | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | navit/xslt/android.xslt | 20 |
2 files changed, 31 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa57b658..9c52e475 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -441,13 +441,25 @@ add_feature(SVG2PNG "default" TRUE) add_feature(SAMPLE_MAP "default" TRUE) IF(NOT svg2png_scaling) - set(svg2png_scaling 0 16 32 48 64 96) + IF(NOT ANDROID) + set(svg2png_scaling 0 16 32 48 64 96) + ELSE() + set(svg2png_scaling 24 32 48 64 96 128) + ENDIF() ENDIF() IF(NOT svg2png_scaling_flag) - set(svg2png_scaling_flag 32) + IF(NOT ANDROID) + set(svg2png_scaling_flag 32) + ELSE() + set(svg2png_scaling_flag 32 64 96) + ENDIF() ENDIF() IF(NOT svg2png_scaling_nav) - set(svg2png_scaling_nav 64) + IF(NOT ANDROID) + set(svg2png_scaling_nav 64) + ELSE() + set(svg2png_scaling_nav 24 32 48 64 96 128) + ENDIF() ENDIF() add_feature(DBUS_USE_SYSTEM_BUS "default" FALSE) diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt index 6588421b..ab0d114b 100644 --- a/navit/xslt/android.xslt +++ b/navit/xslt/android.xslt @@ -76,10 +76,14 @@ <xsl:if test="@radius"> <xsl:attribute name="radius"><xsl:value-of select="round(number(@radius)*number($OSD_SIZE))"/></xsl:attribute> </xsl:if> - <xsl:if test="@w"> + <xsl:if test="name()='icon'"> + <xsl:attribute name="w"><xsl:value-of select="round(24.0*number($OSD_SIZE))"/></xsl:attribute> + <xsl:attribute name="h"><xsl:value-of select="round(24.0*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:if test="@w and not(name()='icon')"> <xsl:attribute name="w"><xsl:value-of select="round(number(@w)*number($OSD_SIZE))"/></xsl:attribute> </xsl:if> - <xsl:if test="@h"> + <xsl:if test="@h and not(name()='icon')"> <xsl:attribute name="h"><xsl:value-of select="round(number(@h)*number($OSD_SIZE))"/></xsl:attribute> </xsl:if> <xsl:apply-templates/> @@ -91,10 +95,18 @@ </xsl:if> </xsl:copy> </xsl:template> - <xsl:template match="/config/navit/layout[@name='Car-Android']"> + <xsl:template match="/config/navit/layout"> <xsl:copy> <xsl:copy-of select="@*"/> - <xsl:attribute name="active">1</xsl:attribute> + <xsl:if test="@name='Car-Android'"> + <xsl:attribute name="active">1</xsl:attribute> + </xsl:if> + <xsl:if test="number($OSD_SIZE)>3"> + <xsl:attribute name="order_delta">-2</xsl:attribute> + </xsl:if> + <xsl:if test="number($OSD_SIZE)>1.4 and 3>=number($OSD_SIZE)"> + <xsl:attribute name="order_delta">-1</xsl:attribute> + </xsl:if> <xsl:apply-templates/> </xsl:copy> </xsl:template> |