Skip to content

Commit b0e8108

Browse files
authored
Merge branch 'main' into featureMain/AboutDialog
2 parents 10957c9 + 4884809 commit b0e8108

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2119
-1744
lines changed

.Defaults/layouts/layout11.json

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"WindowConfigs": [
3+
{
4+
"Title": "Graph View##1",
5+
"Visible": true
6+
},
7+
{
8+
"Title": "Parameters##1",
9+
"Visible": false
10+
},
11+
{
12+
"Title": "Symbol Library",
13+
"Visible": false
14+
},
15+
{
16+
"Title": "Variations",
17+
"Visible": false
18+
},
19+
{
20+
"Title": "Variation Explorer",
21+
"Visible": false
22+
},
23+
{
24+
"Title": "Render To File",
25+
"Visible": false
26+
},
27+
{
28+
"Title": "IO Events",
29+
"Visible": false
30+
},
31+
{
32+
"Title": "Console",
33+
"Visible": false
34+
},
35+
{
36+
"Title": "Utilities",
37+
"Visible": false
38+
},
39+
{
40+
"Title": "Settings",
41+
"Visible": false
42+
},
43+
{
44+
"Title": "Graph View##0",
45+
"Visible": false
46+
},
47+
{
48+
"Title": "Graph View##1",
49+
"Visible": true
50+
}
51+
],
52+
"ImGuiSettings": "[Window][DockSpaceViewport_11111111]\nPos=0,26\nSize=2560,1414\nCollapsed=0\n\n[Window][Graph View##1]\nPos=0,26\nSize=2560,1414\nCollapsed=0\nDockId=0x00000001,0\n\n[Window][Parameters]\nPos=1661,710\nSize=442,568\nCollapsed=0\nDockId=0x00000005,0\n\n[Window][Variations]\nPos=1492,26\nSize=1068,1102\nCollapsed=0\nDockId=0x00000009,0\n\n[Window][Output View##0]\nPos=1492,26\nSize=1068,682\nCollapsed=0\nDockId=0x00000003,0\n\n[Window][Debug##Default]\nPos=60,60\nSize=400,400\nCollapsed=0\n\n[Window][Explore Variations]\nPos=810,306\nSize=768,283\nCollapsed=0\n\n[Window][Console]\nPos=1492,26\nSize=1068,1414\nCollapsed=0\nDockId=0x0000000A,0\n\n[Window][Output View##1]\nPos=0,26\nSize=2304,712\nCollapsed=0\n\n[Window][Symbol Library]\nPos=0,26\nSize=185,1414\nCollapsed=0\nDockId=0x00000007,0\n\n[Window][Render as Video]\nPos=2105,710\nSize=455,568\nCollapsed=0\nDockId=0x00000009,1\n\n[Window][##typeAheadSearchPopup]\nPos=1050,640\nSize=250,184\nCollapsed=0\n\n[Window][Combine into symbol]\nPos=1030,545\nSize=500,350\nCollapsed=0\n\n[Window][Parameters##98]\nPos=0,576\nSize=323,864\nCollapsed=0\n\n[Window][Add output]\nPos=1030,595\nSize=500,250\nCollapsed=0\n\n[Window][Duplicate as new symbol]\nPos=1030,580\nSize=500,280\nCollapsed=0\n\n[Window][Output View##97]\nPos=0,26\nSize=1728,927\nCollapsed=0\n\n[Window][Output View##98]\nPos=0,26\nSize=2304,593\nCollapsed=0\n\n[Window][Parameters##1]\nPos=1492,26\nSize=482,1414\nCollapsed=0\nDockId=0x0000000B,0\n\n[Window][Render To File]\nPos=1492,26\nSize=1068,1102\nCollapsed=0\nDockId=0x00000009,0\n\n[Docking][Data]\nDockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,26 Size=2560,1414 Split=X Selected=0x1F46795C\n DockNode ID=0x00000007 Parent=0x8B93E3BD SizeRef=185,1391 Selected=0xCA18E6EB\n DockNode ID=0x00000008 Parent=0x8B93E3BD SizeRef=1733,1391 Split=X\n DockNode ID=0x00000001 Parent=0x00000008 SizeRef=1303,1391 CentralNode=1 HiddenTabBar=1 Selected=0xF7A0F8A9\n DockNode ID=0x00000002 Parent=0x00000008 SizeRef=1068,1391 Split=Y Selected=0x9CE63BF6\n DockNode ID=0x00000003 Parent=0x00000002 SizeRef=768,497 Selected=0xC11E5CAE\n DockNode ID=0x00000004 Parent=0x00000002 SizeRef=768,532 Split=X Selected=0x9CE63BF6\n DockNode ID=0x00000005 Parent=0x00000004 SizeRef=442,365 Selected=0x9CE63BF6\n DockNode ID=0x00000006 Parent=0x00000004 SizeRef=455,365 Split=X Selected=0x3BC11B9B\n DockNode ID=0x0000000B Parent=0x00000006 SizeRef=482,568 Selected=0x9CE63BF6\n DockNode ID=0x0000000C Parent=0x00000006 SizeRef=584,568 Split=Y Selected=0x3BC11B9B\n DockNode ID=0x00000009 Parent=0x0000000C SizeRef=450,568 Selected=0x770CC517\n DockNode ID=0x0000000A Parent=0x0000000C SizeRef=450,160 Selected=0x49278EEE\n\n"
53+
}

Core/Model/SymbolJson.cs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,12 @@ private static bool TryReadSymbolChild(in JsonChildResult childJsonResult, Symbo
184184
}
185185

186186
var symbolChildJson = childJsonResult.Json;
187-
var nameToken = symbolChildJson[JsonKeys.SymbolChildName]?.Value<string>();
188-
string? name = null;
189-
var isBypassed = false;
190-
if (nameToken != null)
191-
{
192-
name = nameToken;
193-
}
187+
188+
var name = symbolChildJson[JsonKeys.SymbolChildName]?.Value<string>();
194189

195-
var isBypassedJson = symbolChildJson[JsonKeys.IsBypassed];
196-
if (isBypassedJson != null)
197-
{
198-
isBypassed = isBypassedJson.Value<bool>();
199-
}
190+
var isBypassed = false;
191+
if (symbolChildJson[JsonKeys.IsBypassed] is { } tt)
192+
isBypassed = tt.Value<bool>();
200193

201194
var modifyAction = new Action<Symbol.Child>(child =>
202195
{

0 commit comments

Comments
 (0)