Skip to content

Commit 24ca262

Browse files
dnenovdnenov
committed
Merge remote-tracking branch 'upstream/master' into homepage-tests-refactor
2 parents 3168b22 + bbc1779 commit 24ca262

File tree

21 files changed

+3207
-42
lines changed

21 files changed

+3207
-42
lines changed

‎src/DynamoCore/DynamoCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<ItemGroup Label="Common dependencies">
3333
<PackageReference Include="Autodesk.IDSDK" Version="1.1.8" />
3434
<PackageReference Include="Greg" Version="3.0.0.3175" />
35-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" GeneratePathProperty="true" />
35+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" GeneratePathProperty="true" />
3636
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
3737
<PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
3838
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />

‎src/DynamoCoreWpf/DynamoCoreWpf.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,16 @@
167167
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
168168
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
169169
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
170-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
170+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
171171
<PackageReference Include="FontAwesome5" Version="2.1.11" />
172172
<PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
173173
<PackageReference Include="Greg" Version="3.0.0.3175" />
174174
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
175-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
176-
<PackageReference Include="RestSharp" Version="108.0.1" />
177-
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
178-
<PackageReference Include="SharpDX" Version="4.2.0" />
179-
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0">
175+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
176+
<PackageReference Include="RestSharp" Version="108.0.1" />
177+
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
178+
<PackageReference Include="SharpDX" Version="4.2.0" />
179+
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0">
180180
<IncludeAssets>none</IncludeAssets>
181181
</PackageReference>
182182
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0">
@@ -1836,4 +1836,4 @@
18361836
<Target Name="AfterBuildOps" AfterTargets="Build">
18371837
<MakeDir Directories="$(OutputPath)\viewExtensions\" />
18381838
</Target>
1839-
</Project>
1839+
</Project>

‎src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public partial class ConnectorViewModel : ViewModelBase
7171
public List<Point[]> BezierControlPoints { get; set; }
7272

7373
/// <summary>
74-
/// Property tracks 'X' location from mouse poisition
74+
/// Property tracks 'X' location from mouse position
7575
/// </summary>
7676
public double PanelX
7777
{
@@ -119,7 +119,7 @@ public Point MousePosition
119119
}
120120

121121
/// <summary>
122-
/// This WatchHoverViewModel controls the visibility and behaviour of the WatchHoverIcon
122+
/// This WatchHoverViewModel controls the visibility and behavior of the WatchHoverIcon
123123
/// which appears when you hover over this connector.
124124
/// </summary>
125125
public ConnectorAnchorViewModel ConnectorAnchorViewModel
@@ -537,7 +537,7 @@ public PreviewState PreviewState
537537

538538
/// <summary>
539539
/// Toggle used to turn Connector PreviewState to the correct state when a pin is selected.
540-
/// Modelled after connector preview behaviour when a node is selected.
540+
/// Modelled after connector preview behavior when a node is selected.
541541
/// </summary>
542542
public bool AnyPinSelected
543543
{
@@ -1371,7 +1371,7 @@ private void HandlePinModelChanged(object sender, NotifyCollectionChangedEventAr
13711371
/// <summary>
13721372
/// Removes all connectorPinViewModels/ connectorPinModels. This occurs during 'dispose'
13731373
/// operation as well as during the 'PlaceWatchNode', where all previous pins corresponding
1374-
/// to a connector are cleareed.
1374+
/// to a connector are cleared.
13751375
/// </summary>
13761376
/// <param name="allDeletedModels"> This argument is used when placing a WatchNode from ConnectorAnchorViewModel. A reference
13771377
/// to all previous pins is required for undo/redo recorder.</param>
@@ -1426,9 +1426,24 @@ public void Redraw()
14261426
this.Redraw(this.ConnectorModel.End.Center);
14271427
}
14281428

1429+
this.SetCollapsedByNodeViewModel();
14291430
RaisePropertyChanged(nameof(ZIndex));
14301431
}
14311432

1433+
/// <summary>
1434+
/// Evaluates whether both nodes associated with a connector are collapsed, if so, collapses the connector itself.
1435+
/// This is to address DYN-4449. Connectors are only recorded in the Undo stack when they are connected.
1436+
/// Consequently, if a group is collapsed and then moved, performing an Undo operation will not restore
1437+
/// the connector to its state at the time the move was recorded.
1438+
/// </summary>
1439+
private void SetCollapsedByNodeViewModel()
1440+
{
1441+
if (this.Nodevm.IsCollapsed && this.NodeEnd.IsCollapsed)
1442+
{
1443+
this.IsCollapsed = true;
1444+
}
1445+
}
1446+
14321447
/// <summary>
14331448
/// Recalculate the connector's points given the end point
14341449
/// </summary>

‎src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockEditorUtils.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,12 @@ private static SolidColorBrush CreateFrozenBrush(Color color)
130130

131131
public static void CreateHighlightingRules(ICSharpCode.AvalonEdit.TextEditor editor, EngineController controller)
132132
{
133-
var stream = typeof(CodeHighlightingRuleFactory).Assembly.GetManifestResourceStream(
134-
"Dynamo.Wpf.UI.Resources." + Configurations.HighlightingFile);
133+
using var stream = typeof(CodeHighlightingRuleFactory).Assembly.GetManifestResourceStream(
134+
"Dynamo.Wpf.UI.Resources." + Configurations.HighlightingFile);
135135

136136
// Hyperlink color
137-
editor.TextArea.TextView.LinkTextForegroundBrush = new SolidColorBrush(Color.FromArgb(255, 106, 192, 231));
137+
editor.TextArea.TextView.LinkTextForegroundBrush =
138+
new SolidColorBrush(Color.FromArgb(255, 106, 192, 231));
138139

139140
editor.SyntaxHighlighting = HighlightingLoader.Load(
140141
new XmlTextReader(stream), HighlightingManager.Instance);

‎src/DynamoManipulation/DynamoManipulation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ProjectReference>
4141
</ItemGroup>
4242
<ItemGroup>
43-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
43+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
4444
</ItemGroup>
4545
<ItemGroup>
4646
<Compile Update="Properties\Resources.Designer.cs">
@@ -70,4 +70,4 @@
7070
</ItemGroup>
7171
<Copy SourceFiles="@(ExtensionDefinition)" DestinationFolder="$(OutputPath)\viewExtensions\" />
7272
</Target>
73-
</Project>
73+
</Project>

‎src/Libraries/Analysis/Analysis.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<None Remove="AnalysisImages.resources" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
21+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
2222
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
2323
<Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
2424
<Name>DynamoCore</Name>
@@ -65,4 +65,4 @@
6565
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)AnalysisImages.resx" OutputResources="$(ProjectDir)AnalysisImages.resources" />
6666
<AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)AnalysisImages.resources" OutputAssembly="$(OutDir)Analysis.customization.dll" Version="%(AssemblyInfo.Version)" />
6767
</Target>
68-
</Project>
68+
</Project>

‎src/Libraries/CoreNodes/CoreNodes.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Compile Remove="GeometryColor.cs" />
2020
</ItemGroup>
2121
<ItemGroup Label="Common dependencies">
22-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
22+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">

‎src/Libraries/GeometryColor/GeometryColor.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
17+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
@@ -72,4 +72,4 @@
7272
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)Resources\GeometryColor.resx" OutputResources="$(ProjectDir)Resources\GeometryColorImages.resources" />
7373
<AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)Resources\GeometryColorImages.resources" OutputAssembly="$(OutDir)GeometryColor.customization.dll" Version="%(AssemblyInfo.Version)" />
7474
</Target>
75-
</Project>
75+
</Project>

‎src/Libraries/GeometryUI/GeometryUI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<ImportGroup Label="PropertySheets">
33
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
44
</ImportGroup>
@@ -17,7 +17,7 @@
1717
</ReferenceCopyLocalPaths>
1818
</ItemDefinitionGroup>
1919
<ItemGroup>
20-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
20+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
2121
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2222
</ItemGroup>
2323
<ItemGroup>
@@ -74,4 +74,4 @@
7474
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)GeometryUIImages.resx" OutputResources="$(ProjectDir)GeometryUIImages.resources" />
7575
<AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)GeometryUIImages.resources" OutputAssembly="$(OutDir)GeometryUI.customization.dll" Version="%(AssemblyInfo.Version)" />
7676
</Target>
77-
</Project>
77+
</Project>

‎src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ReferenceCopyLocalPaths>
2222
</ItemDefinitionGroup>
2323
<ItemGroup>
24-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
24+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4575" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<Page Include="Controls\ExportWithUnitsControl.xaml">
@@ -97,4 +97,4 @@
9797
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)ProtoGeometryImages.resx" OutputResources="$(ProjectDir)ProtoGeometryImages.resources" />
9898
<AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)ProtoGeometryImages.resources" OutputAssembly="$(OutDir)..\ProtoGeometry.customization.dll" Version="%(ProtoGeometryInfo.Version)" />
9999
</Target>
100-
</Project>
100+
</Project>

0 commit comments

Comments
 (0)