widen cancel button so ‘l’ not cut-off in small DPI mode

added BtwnTextAndBottom2 for y-location of continue message
Implement BtwnTextAndBottom2
This commit is contained in:
2014-05-15 12:42:45 +00:00
parent 074ff3e888
commit 5023c30710
3 changed files with 24 additions and 12 deletions

View File

@@ -958,7 +958,7 @@ namespace Volian.Print.Library
}
break;
case E_ContBottomLoc.BtwnTextAndBottom: // place continue string between end of text & bottom of page
msg_yLocation = msg_yLocation + yLocation - ((yLocation - yBottomMargin) / 2); // +SixLinesPerInch; (need this for IP3)
msg_yLocation = msg_yLocation + yLocation - ((yLocation - yBottomMargin) / 2); // +SixLinesPerInch; // (need this for IP3)
if (msg_yLocation < yBottomMargin) msg_yLocation = yBottomMargin;
break;
case E_ContBottomLoc.BottomOfPage: // place continue message at bottom of page
@@ -971,6 +971,12 @@ namespace Volian.Print.Library
case E_ContBottomLoc.EndOfText2: // Like EndOfText but limited within yBottomMargin
msg_yLocation = Math.Max(msg_yLocation + yLocation - SixLinesPerInch, yBottomMargin + SixLinesPerInch);
break;
case E_ContBottomLoc.BtwnTextAndBottom2:
// Like BtwnTextAndBottom but accounts for line spacing of step & is 1 line up on page (for BGE - Procedure Steps - 2 column)
float adj = (MyItemInfo.FormatStepData.StepLayoutData.EveryNLines == 1) ? SixLinesPerInch : 0;
msg_yLocation = msg_yLocation + yLocation - ((yLocation - yBottomMargin) / 2) + adj + SixLinesPerInch;
if (msg_yLocation < yBottomMargin) msg_yLocation = yBottomMargin;
break;
default:
_MyLog.WarnFormat("**** BOTTOM CONTINUE MESSAGE NOT CODED FOR LOCATION {0}*****", docstyle.Continue.Bottom.Location);
break;