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

B2021-032: Summary of changes included tables that were not changed (font was changed)

Browse Source
This commit is contained in:
Kathy Ruffing 2021-04-13 11:44:06 +00:00
parent d4b3cced0b
commit c88266ae58
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
PROMS/Volian.Controls.Library/VlnFlexGrid.cs
View File

@ -167,6 +167,7 @@ namespace Volian.Controls.Library
if (this.TableCellEditor.Text.Contains("<NewID>")) if (this.TableCellEditor.Text.Contains("<NewID>"))
return false; return false;
XmlDocument XdOld = new XmlDocument(); XmlDocument XdOld = new XmlDocument();
oldXml = _ReplaceTextFont.Replace(oldXml, "$1" + FontChangeFmt + "$4"); // B2021-032: use original font
XdOld.LoadXml(AdjustHeightAndWidthForDPI(oldXml)); XdOld.LoadXml(AdjustHeightAndWidthForDPI(oldXml));
XmlDocument XdNew = new XmlDocument(); XmlDocument XdNew = new XmlDocument();
XdNew.LoadXml(AdjustHeightAndWidthForDPI(newXml)); XdNew.LoadXml(AdjustHeightAndWidthForDPI(newXml));
@ -900,23 +901,29 @@ namespace Volian.Controls.Library
if (sfW.Width == sfE.Width) return true; if (sfW.Width == sfE.Width) return true;
return false; return false;
} }
public void LoadGrid(ItemInfo itemInfo) // B2021-032: Changes (summary of changes after approval) occur when table does not change. This occurs if the font
// of the table changed in the format so that when the font was used the first time, the save code saw it
// as a difference. Save the new font, so that it can be used when doing the comparison before saving data.
private string _fontChangeFmt = null;
public string FontChangeFmt { get => _fontChangeFmt; set => _fontChangeFmt = value; }
public void LoadGrid(ItemInfo itemInfo)
{ {
int profileDepth = ProfileTimer.Push(">>>> VlnFlexGrid.LoadGrid"); int profileDepth = ProfileTimer.Push(">>>> VlnFlexGrid.LoadGrid");
_MyItemInfo = itemInfo; _MyItemInfo = itemInfo;
string str = itemInfo.MyContent.MyGrid.Data; string str = itemInfo.MyContent.MyGrid.Data;
VE_Font vefont = _MyItemInfo.GetItemFont(); VE_Font vefont = _MyItemInfo.GetItemFont();
// the following code is used to be sure that the font used for symbols is the correct font // the following code is used to be sure that the font used for symbols is the correct font
// based on whether the font for non-symbol text is fixed or proportional. Each steprtb has // based on whether the font for non-symbol text is fixed or proportional. Each steprtb has
// a font for the non-symbol AND the symbol text, and these must be the correct association, i.e. // a font for the non-symbol AND the symbol text, and these must be the correct association, i.e.
// for fixed fonts, the symbol font is 'VESymbFix', for proportional fonts, the symbol font is // for fixed fonts, the symbol font is 'VESymbFix', for proportional fonts, the symbol font is
// 'Arial Unicode MS'. The underlying flexgrid stores the fonts, and if the table font was // 'Arial Unicode MS'. The underlying flexgrid stores the fonts, and if the table font was
// reset for some reason (for example from the drop-down font selection in the user interface), // reset for some reason (for example from the drop-down font selection in the user interface),
// this code 'cleans' up if there is a mismatch. // this code 'cleans' up if there is a mismatch.
FontFamily ff = null;
if (StepRTB.MyFontFamily != null) if (StepRTB.MyFontFamily != null)
{ {
FontFamily ff = StepRTB.MyFontFamily; ff = StepRTB.MyFontFamily;
if (StepRTB.MySymbolFontName != "FreeMono") // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing if (StepRTB.MySymbolFontName != "FreeMono") // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing
str = _ReplaceVESymbFix.Replace(str, "$1" + StepRTB.MySymbolFontName + "$3"); str = _ReplaceVESymbFix.Replace(str, "$1" + StepRTB.MySymbolFontName + "$3");
if (StepRTB.MySymbolFontName != Volian.Base.Library.vlnFont.ProportionalSymbolFont) // C2017-036 get best available proportional font for symbols if (StepRTB.MySymbolFontName != Volian.Base.Library.vlnFont.ProportionalSymbolFont) // C2017-036 get best available proportional font for symbols
@ -925,13 +932,15 @@ namespace Volian.Controls.Library
} }
else else
{ {
FontFamily ff = vefont.WindowsFont.FontFamily; ff = vefont.WindowsFont.FontFamily;
if (FontIsFixed(vefont.WindowsFont)) if (FontIsFixed(vefont.WindowsFont))
str = _ReplaceArialUnicodeMS.Replace(str, "$1" + "FreeMono" + "$3"); // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing str = _ReplaceArialUnicodeMS.Replace(str, "$1" + "FreeMono" + "$3"); // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing
else else
str = _ReplaceVESymbFix.Replace(str, "$1" + Volian.Base.Library.vlnFont.ProportionalSymbolFont + "$3"); // C2017-036 get best available proportional font for symbols str = _ReplaceVESymbFix.Replace(str, "$1" + Volian.Base.Library.vlnFont.ProportionalSymbolFont + "$3"); // C2017-036 get best available proportional font for symbols
str = _ReplaceTextFont.Replace(str, "$1" + ff.Name + "$4"); str = _ReplaceTextFont.Replace(str, "$1" + ff.Name + "$4");
} }
FontChangeFmt = ff.Name; // B2021-032
// To prevent scroll bars from being flashed on/off // To prevent scroll bars from being flashed on/off
// - save an image of the current grid // - save an image of the current grid
// - set Visible to false // - set Visible to false