Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Was going through left tab adjust logic even though the adjustment for the current level was zero. This caused an extra space to be added in between the tab and the step text which shortened the step text width and cause different word wrapping. This happens only when the UseMetaSection flag is turned

Browse Source
This commit is contained in:
John Jenko 2014-10-09 13:32:39 +00:00
parent f7e805a745
commit be96be3ecc
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -3852,16 +3852,29 @@ namespace Volian.Print.Library
{
int indxLevels = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel();
float tableftadj = GetLeftJustify(formatInfo, indxLevels);
// the order of this is important. First adjust the tab's xoffset for the width of
// the tab. The offset of text needs to be adjusted by the 'leftjustify' format variable
// if it existed for this level.
myTab.XOffset += tabWidth;
if (tableftadj != 0 && myTab.Width < tableftadj)
tabWidth = myTab.Width = tableftadj;
XOffset += tabWidth;
myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray()));
Width = MyParent.Width - myTab.Width;
if (tableftadj != 0)
{
// the order of this is important. First adjust the tab's xoffset for the width of
// the tab. The offset of text needs to be adjusted by the 'leftjustify' format variable
// if it existed for this level.
myTab.XOffset += tabWidth;
if (tableftadj != 0 && myTab.Width < tableftadj)
tabWidth = myTab.Width = tableftadj;
XOffset += tabWidth;
myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray()));
Width = MyParent.Width - myTab.Width;
}
else // if no left justify, right align the tab
{
XOffset += tabWidth - (myTab == null ? 0 : myTab.TabAlign);
if (myTab != null)
{
myTab.XOffset += tabWidth - myTab.TabAlign;
if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
}
}
}
//else if ((itemInfo.FormatStepData.ColOverride ?? 0) > 0)
//{
// XOffset = (float)itemInfo.FormatStepData.ColOverride;