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

fixed footnote tabbing in editor & made other note types inactive

Browse Source 
BGEVLV: for ‘TitleWithTextRight’ types, position correctly on screen if no children for this type
BGEVLV: don’t print duplicate footnote data even if it exists in data; fixed y-location of footnotes on last page of section.
This commit is contained in:
Kathy Ruffing
2014-10-30 14:24:48 +00:00
parent dad37c50a8
commit 09c88e8948
3 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PROMS/Volian.Controls.Library/EditItem.cs
View File

@@ -1752,9 +1752,10 @@ namespace Volian.Controls.Library
//if (MyItemInfo.SameRowAsParent && MyItemInfo.IsCaution2)
// bottom = Top;
// If this is a "TitleWithTextRight", don't move down on the screen:
// If this is a "TitleWithTextRight", don't move down on the screen but only if it has a
// child, i.e. want the child to be positioned on line, but if no child, move down on screen:
int newTop = bottom;
if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Type == "TitleWithTextRight") newTop = Top;
if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Type == "TitleWithTextRight" && MyItemInfo.HasChildren) newTop = Top;
if (nextEditItem.Top != newTop)
{
MyStepPanel.ItemMoving++;
@@ -2152,6 +2153,8 @@ namespace Volian.Controls.Library
// Paul Linn made the request on 6/4/12 to align the Component Description &
// Required Position under the Component Number.
ItemLocation = new Point(_MyParentEditItem.ItemLocation.X, _MyParentEditItem.Bottom);
else if (MyItemInfo.FormatStepData.Type == "TitleWithTextRight" && MyItemInfo.Steps.Count==0) // this code is run for siblings within a HLS (but not last sibling).
ItemLocation = new Point(_MyParentEditItem.ItemLocation.X, _MyParentEditItem.Bottom);
else if (MyItemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight")
ItemLocation = new Point(_MyParentEditItem.ItemLocation.X + _MyParentEditItem.ItemWidth, _MyParentEditItem.ItemLocation.Y);
else if (MyItemInfo.MyTab.Offset != 0)
@@ -2160,26 +2163,25 @@ namespace Volian.Controls.Library
else
ItemLocation = new Point(_MyParentEditItem.ContentLeft, _MyParentEditItem.Bottom);
bool specialTplSupport =((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) ||
(MyItemInfo.MyDocStyle.LandscapePageList && MyItemInfo.MyDocStyle.ComponentList);
if (MyItemInfo.FormatStepData.ReadOnly)
{
Graphics g = CreateGraphics();
SizeF sz = g.MeasureString(MyItemInfo.MyContent.Text, MyItemInfo.FormatStepData.Font.WindowsFont);
ItemWidth = (int)sz.Width;
}
else if (MyItemInfo.FormatStepData.Type == "TitleWithTextRight" &&
((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))
else if (MyItemInfo.FormatStepData.Type == "TitleWithTextRight" && specialTplSupport)
{
Graphics g = CreateGraphics();
SizeF sz = g.MeasureString(MyItemInfo.MyContent.Text, MyItemInfo.FormatStepData.Font.WindowsFont);
ItemWidth = (int)sz.Width + 5;
}
else if (MyItemInfo.FormatStepData.Type == "TitleWithTextBelow" &&
((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))
else if (MyItemInfo.FormatStepData.Type == "TitleWithTextBelow" && specialTplSupport)
{
ItemWidth = MyStepPanel.ToDisplay(MyStepSectionLayoutData.WidSTableEdit, 0);
}
else if (MyItemInfo.MyParent.FormatStepData.Type == "TitleWithTextBelow" &&
((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))
else if (MyItemInfo.MyParent.FormatStepData.Type == "TitleWithTextBelow" && specialTplSupport)
{
ItemWidth = MyParentEditItem.ItemWidth - RTBItem.RTBMargin;
}