diff --git a/language.version b/language.version index af8e82f02..9ceacb18b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r541 \cu(Sun 13 Jun 18:49:43 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r541 \cu(2021-06-13 18:49:43)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r542 \cu(Mon 14 Jun 21:43:49 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r542 \cu(2021-06-14 21:43:49)\c-"; diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc index 180b1f57d..342b988b5 100644 --- a/zscript/menu/swwm_menus.zsc +++ b/zscript/menu/swwm_menus.zsc @@ -430,18 +430,24 @@ Class SWWMBigMenuHack : SWWMCleanMenu h = 200; isclean = true; } - int mofs = (h-280)/2; + String str = "⌃ ⌃ ⌃"; + int x = (w-markfont.StringWidth(str))/2; + int y = (h-280)/2; + if ( isclean ) + { + x = (x-160)*CleanXFac_1+(Screen.GetWidth()/2); + y = (y-100)*CleanYFac_1+(Screen.GetHeight()/2); + } if ( ofs > 0 ) { - String str = "⌃ ⌃ ⌃"; - if ( isclean ) Screen.DrawText(markfont,Font.CR_FIRE,int((w-markfont.StringWidth(str))/2.),mofs+40,str,DTA_Clean,true); - else Screen.DrawText(markfont,Font.CR_FIRE,int((w-markfont.StringWidth(str))/2.),mofs+40,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); + if ( isclean ) Screen.DrawText(markfont,Font.CR_FIRE,x,y+30*CleanYFac_1,str,DTA_CleanNoMove_1,true); + else Screen.DrawText(markfont,Font.CR_FIRE,x,y+30,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); } if ( ofs < (mDesc.mItems.Size()-8) ) { - String str = "⌄ ⌄ ⌄"; - if ( isclean ) Screen.DrawText(markfont,Font.CR_FIRE,int((w-markfont.StringWidth(str))/2.),mofs+276,str,DTA_Clean,true); - else Screen.DrawText(markfont,Font.CR_FIRE,int((w-markfont.StringWidth(str))/2.),mofs+276,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); + str = "⌄ ⌄ ⌄"; + if ( isclean ) Screen.DrawText(markfont,Font.CR_FIRE,x,y+296*CleanYFac_1,str,DTA_CleanNoMove_1,true); + else Screen.DrawText(markfont,Font.CR_FIRE,x,y+296,str,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43); } for ( int i=0; i