diff options
| author | mvglasow <michael -at- vonglasow.com> | 2019-01-23 16:19:15 +0100 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2019-01-23 17:01:03 +0100 |
| commit | 384584f2bca78e749a3cfdc39854840146f8ac4c (patch) | |
| tree | f4105fde1f24b506d8d79a8338894abc89ca28d5 | |
| parent | 7cf1c946edbf828631d44934993530da05d93711 (diff) | |
| download | navit-384584f2bca78e749a3cfdc39854840146f8ac4c.tar.gz | |
Refactor:gui:Rearrange buttons to fit on 360x360 screen
Signed-off-by: mvglasow <michael -at- vonglasow.com>
| -rw-r--r-- | navit/xslt/osd_android.xslt | 2 | ||||
| -rw-r--r-- | navit/xslt/osd_minimum.xslt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/navit/xslt/osd_android.xslt b/navit/xslt/osd_android.xslt index 01f7e75e9..cc970db36 100644 --- a/navit/xslt/osd_android.xslt +++ b/navit/xslt/osd_android.xslt @@ -3,6 +3,6 @@ <xsl:template match="/config/navit/osd[last()]"> <xsl:copy><xsl:copy-of select="@*|node()"/></xsl:copy> <xsl:text>
 </xsl:text> - <osd type="button" src="gui_android_menu_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="graphics.menu()" x="{round(-3*(number($ICON_BIG)+8*number($OSD_SIZE))-60*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" enable_expression="!has_menu_button" use_overlay="yes"/> + <osd type="button" src="gui_android_menu_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="graphics.menu()" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE)))}" y="{round(62*number($OSD_SIZE))}" enable_expression="!has_menu_button" use_overlay="yes"/> </xsl:template> </xsl:transform> diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt index 2ce4d8f32..1956095fb 100644 --- a/navit/xslt/osd_minimum.xslt +++ b/navit/xslt/osd_minimum.xslt @@ -22,7 +22,7 @@ <osd type="text" label="${{tracking.item.street_name_systematic}}${{tracking.item.street_name}}" x="0" y="{round(-14*number($OSD_SIZE))}" w="100%" h="{round(14*number($OSD_SIZE))}" font_size="{round(200*number($OSD_SIZE))}" enable_expression="vehicle.position_valid"/> <xsl:text>
 </xsl:text> <!-- TODO does this need an icon_src attribute? --> - <osd type="toggle_announcer" icon_src="%s_{number($ICON_BIG)}_{number($ICON_BIG)}.png" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE)))}" y="{round(62*number($OSD_SIZE))}"/> + <osd type="toggle_announcer" icon_src="%s_{number($ICON_BIG)}_{number($ICON_BIG)}.png" x="{round(8*number($OSD_SIZE))}" y="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-14*number($OSD_SIZE))}"/> <xsl:text>
 </xsl:text> <!-- TODO implement <osd type="button" src="gui_zoom_manual_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=0" x="0" y="0" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active!=0"/> @@ -34,7 +34,7 @@ <xsl:text>
 </xsl:text> <osd type="button" src="zoom_out_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_out()" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-60*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/> <xsl:text>
 </xsl:text> - <osd type="button" src="follow_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="follow=0;set_center_cursor()" x="{round(8*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" enable_expression="follow>1" use_overlay="{$OSD_USE_OVERLAY}"/> + <osd type="button" src="follow_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="follow=0;set_center_cursor()" x="{round(8*number($OSD_SIZE))}" y="{round(-2*(number($ICON_BIG)+8*number($OSD_SIZE))-14*number($OSD_SIZE))}" enable_expression="follow>1" use_overlay="{$OSD_USE_OVERLAY}"/> <xsl:text>
 </xsl:text> <osd type="cmd_interface" update_period="1" command="pitch=autozoom_active==0?pitch:(follow>1?0:20);orientation=autozoom_active==0?orientation:(follow>1?0:-1)" x="-1" y="-1" w="1" h="1"/> <xsl:text>
 </xsl:text> |