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

Merge pull request 'Development' (#104) from Development into master

Browse Source 
Merging B2023-089 and F2023-131 from Development into Master.  No testing required since formats are under development.
This commit is contained in:
Devin Jankowski 2023-08-24 09:05:31 -04:00
commit b954a41375
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BASEall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/GENall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/gen.svg
View File

Binary file not shown.

5
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@ -1833,7 +1833,10 @@ namespace Volian.Controls.Library
if (_ItemInfo != null) if (_ItemInfo != null)
{ {
_OpenDocFromSearch = true; _OpenDocFromSearch = true;
DisplayTabItem dti = _TabControl.OpenItem(_ItemInfo); // open the corresponding procedure text // B2023-089: selecting a deleted item from search results shows deleted step in the editor when the StepTabItem for
// the deleted item was displayed but is not the active StepTabItem. Use its procedure if it was deleted
ItemInfo openItem = _ItemInfo.IsDeleted ? ItemInfo.Get(_ItemInfo.MyProcedure == null ? _ItemInfo.ItemID : _ItemInfo.MyProcedure.ItemID) : _ItemInfo;
DisplayTabItem dti = _TabControl.OpenItem(openItem); // open the corresponding procedure text
if (dti != null) if (dti != null)
{ {
if (dti.MyDSOTabPanel != null) if (dti.MyDSOTabPanel != null)