Skip to content

Commit 1e7bdfc

Browse files
miroiumiroiu
authored
Merge branch 'master' into feature/new-blueprint
2 parents 1dd5a06 + 6e4fb71 commit 1e7bdfc

File tree

20 files changed

+170
-90
lines changed

20 files changed

+170
-90
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
steps:
99
- uses: actions/checkout@v2
1010
- name: Setup .NET
11-
uses: actions/setup-dotnet@v1.7.2
11+
uses: actions/setup-dotnet@v2.1.0
1212
with:
13-
dotnet-version: '5.0.x'
13+
dotnet-version: '6.0.x'
1414
- name: Build
1515
run: dotnet build --configuration Release

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ name: "CodeQL"
1414
on:
1515
push:
1616
branches: [ master, release-v* ]
17+
paths:
18+
- Nodify/**
1719
pull_request:
1820
# The branches below must be a subset of the branches above
1921
branches: [ master ]

‎.github/workflows/create-release-branch.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ jobs:
1414
uses: little-core-labs/get-git-tag@v3.0.1
1515
id: tagName
1616
- name: Setup .NET Core
17-
uses: actions/setup-dotnet@v1
17+
uses: actions/setup-dotnet@v2.1.0
1818
with:
19-
dotnet-version: '5.0.x'
19+
dotnet-version: '6.0.x'
2020
- name: Install dependencies
2121
run: dotnet restore
2222
- name: Build
2323
run: dotnet build --configuration Release --no-restore
24-
- name: Test
25-
run: dotnet test --no-restore --verbosity normal
2624
- name: Create release branch
2725
uses: peterjgrainger/action-create-branch@v2.0.0
2826
env:

‎.github/workflows/publish-package.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,18 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Setup .NET Core
15-
uses: actions/setup-dotnet@v1
15+
uses: actions/setup-dotnet@v2.1.0
1616
with:
17-
dotnet-version: '5.0.x'
17+
dotnet-version: '6.0.x'
18+
source-url: https://api.nuget.org/v3/index.json
19+
env:
20+
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_KEY }}
1821
- name: Install dependencies
1922
run: dotnet restore
2023
- name: Build
2124
run: dotnet build --configuration Release --no-restore
22-
- name: Test
23-
run: dotnet test --no-restore --verbosity normal
24-
- name: Publish package
25-
uses: brandedoutcast/publish-nuget@v2.5.5
26-
with:
27-
PACKAGE_NAME: Nodify
28-
PROJECT_FILE_PATH: Nodify/Nodify.csproj
29-
NUGET_KEY: ${{ secrets.NUGET_KEY }}
30-
TAG_COMMIT: false
25+
- name: Publish the package
26+
run: dotnet nuget push */bin/Release/*.nupkg
27+
env:
28+
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_KEY }}
3129

‎CHANGELOG.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
## Changelog
2+
3+
#### **In development**
4+
> - Breaking Changes:
5+
> - Features:
6+
> - Bugfixes:
7+
8+
#### **Version 2.0.1**
9+
> - Bugfixes:
10+
> - Fixed pending connection default style
11+
12+
#### **Version 2.0.0**
13+
> - Breaking Changes:
14+
> - Renamed Offset to ViewportLocation in NodifyEditor
15+
> - Renamed Scale to ViewportZoom in NodifyEditor
16+
> - Renamed MinScale to MinViewportZoom in NodifyEditor
17+
> - Renamed MaxScale to MaxViewportZoom in NodifyEditor
18+
> - Renamed AppliedTransform to ViewportTransform in NodifyEditor
19+
> - Renamed DirectionalConnection to LineConnection
20+
> - Removed BringIntoViewAnimationDuration from NodifyEditor
21+
> - Removed Viewport dependency property from NodifyEditor
22+
> - Removed ActualSize dependency property from StateNode
23+
> - Removed Icon dependency property from Node as the icon can *(and should)* be added in the HeaderTemplate if necessary
24+
> - PART_ItemsHost is now required for NodifyEditor to work
25+
> - ItemContainers cannot be used outside a NodifyEditor anymore
26+
> - ZoomAtPosition now requires graph space coordinates instead of screen space coordinates
27+
> - Removed custom value converters
28+
> - Made DependencyObjectExtensions internal
29+
> - Removed the http://miroiu.github.io/winfx/xaml/nodify xaml prefix
30+
> - Features:
31+
> - Added ResizeStartedEvent routed event to GroupingNode
32+
> - Added ViewportSize - **OneWayToSource** dependency property to NodifyEditor
33+
> - Added ActualSize - **OneWayToSource** dependency property to ItemContainer
34+
> - Added DecoratorContainer and DecoratorContainerStyle dependency properties to NodifyEditor
35+
> - Added RemoveConnectionCommand command to NodifyEditor
36+
> - Added DisconnectCommand and SplitCommand commands to BaseConnection
37+
> - Added ContentBrush dependency property to NodifyEditor
38+
> - Added HasFooter dependency property to Node
39+
> - Added FitToScreen command to NodifyEditor and EditorCommands
40+
> - Added onFinish callback to BringIntoView in NodifyEditor
41+
> - Added ArrowSize and Spacing dependency properties to all connections inheriting from BaseConnection
42+
> - Added BringIntoViewMaxDuration dependency property to NodifyEditor
43+
> - Added BringIntoViewSpeed dependency property to NodifyEditor
44+
> - Auto panning speed now scales with the zoom factor.
45+
> - Bugfixes:
46+
> - Every public property or method should work with graph space coordinates
47+
> - Disable auto panning when panning is disabled
48+
> - Min zoom could be set to a very small value
49+
> - Bring into view was not disabling all interfering operations

‎Examples/Nodify.Calculator/Nodify.Calculator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net5-windows;netcoreapp3.1;net48;net472</TargetFrameworks>
5+
<TargetFrameworks>net6-windows;net5-windows;netcoreapp3.1;net48;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎Examples/Nodify.Playground/Editor/NodifyEditorView.xaml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,25 @@
127127
Fill="{TemplateBinding Background}"
128128
StrokeThickness="2" />
129129
</ControlTemplate>
130+
131+
<Storyboard x:Key="MarchingAnts">
132+
<DoubleAnimation RepeatBehavior="Forever"
133+
Storyboard.TargetProperty="StrokeDashOffset"
134+
BeginTime="00:00:00"
135+
Duration="0:3:0"
136+
From="1000"
137+
To="0"/>
138+
</Storyboard>
139+
140+
<Style x:Key="SelectionRectangleStyle" TargetType="Rectangle" BasedOn="{StaticResource NodifyEditor.SelectionRectangleStyle}">
141+
<Setter Property="StrokeDashArray" Value="4 4" />
142+
<Setter Property="StrokeThickness" Value="2" />
143+
<Style.Triggers>
144+
<EventTrigger RoutedEvent="FrameworkElement.Loaded">
145+
<BeginStoryboard Storyboard="{StaticResource MarchingAnts}" />
146+
</EventTrigger>
147+
</Style.Triggers>
148+
</Style>
130149
</UserControl.Resources>
131150

132151
<Grid>
@@ -149,7 +168,9 @@
149168
DisablePanning="{Binding DisablePanning, Source={x:Static local:EditorSettings.Instance}}"
150169
DisableZooming="{Binding DisableZooming, Source={x:Static local:EditorSettings.Instance}}"
151170
DisplayConnectionsOnTop="{Binding DisplayConnectionsOnTop, Source={x:Static local:EditorSettings.Instance}}"
152-
BringIntoViewAnimationDuration="{Binding BringIntoViewAnimationDuration, Source={x:Static local:EditorSettings.Instance}}">
171+
BringIntoViewSpeed="{Binding BringIntoViewSpeed, Source={x:Static local:EditorSettings.Instance}}"
172+
BringIntoViewMaxDuration="{Binding BringIntoViewMaxDuration, Source={x:Static local:EditorSettings.Instance}}"
173+
SelectionRectangleStyle="{StaticResource SelectionRectangleStyle}">
153174
<nodify:NodifyEditor.Style>
154175
<Style TargetType="{x:Type nodify:NodifyEditor}"
155176
BasedOn="{StaticResource {x:Type nodify:NodifyEditor}}">

‎Examples/Nodify.Playground/EditorSettings.cs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,18 @@ public bool DisplayConnectionsOnTop
169169
set => SetProperty(ref _displayConnectionsOnTop, value);
170170
}
171171

172-
private double _bringIntoViewAnimationDuration = 0.5;
173-
public double BringIntoViewAnimationDuration
172+
private double _bringIntoViewSpeed = 1000;
173+
public double BringIntoViewSpeed
174174
{
175-
get => _bringIntoViewAnimationDuration;
176-
set => SetProperty(ref _bringIntoViewAnimationDuration, value);
175+
get => _bringIntoViewSpeed;
176+
set => SetProperty(ref _bringIntoViewSpeed, value);
177+
}
178+
179+
private double _bringIntoViewMaxDuration = 1;
180+
public double BringIntoViewMaxDuration
181+
{
182+
get => _bringIntoViewMaxDuration;
183+
set => SetProperty(ref _bringIntoViewMaxDuration, value);
177184
}
178185

179186
#endregion

‎Examples/Nodify.Playground/EditorSettingsView.xaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<RowDefinition Height="Auto" />
4444
<RowDefinition Height="Auto" />
4545
<RowDefinition Height="Auto" />
46+
<RowDefinition Height="Auto" />
4647
</Grid.RowDefinitions>
4748

4849
<TextBlock Text="Realtime selection: "
@@ -238,15 +239,24 @@
238239
Margin="0 5 5 0" />
239240

240241
<TextBlock Grid.Row="22"
241-
Text="Bring into view duration: "
242-
ToolTip="Bring location into view animation duration"
242+
Text="Bring into view speed: "
243+
ToolTip="Bring location into view animation speed in pixels per second"
243244
Margin="0 5 5 0" />
244245
<TextBox Grid.Row="22"
245246
Grid.Column="1"
246-
Text="{Binding BringIntoViewAnimationDuration, Mode=TwoWay, Source={x:Static local:EditorSettings.Instance}}"
247+
Text="{Binding BringIntoViewSpeed, Mode=TwoWay, Source={x:Static local:EditorSettings.Instance}}"
248+
Margin="0 5 5 0" />
249+
250+
<TextBlock Grid.Row="23"
251+
Text="Bring into view max duration: "
252+
ToolTip="Bring location into view max animation duration"
253+
Margin="0 5 5 0" />
254+
<TextBox Grid.Row="23"
255+
Grid.Column="1"
256+
Text="{Binding BringIntoViewMaxDuration, Mode=TwoWay, Source={x:Static local:EditorSettings.Instance}}"
247257
Margin="0 5 5 0" />
248258

249-
<Expander Grid.Row="23"
259+
<Expander Grid.Row="24"
250260
Grid.ColumnSpan="2"
251261
Header="Advanced"
252262
Padding="0 5 0 0"

‎Examples/Nodify.Playground/Nodify.Playground.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net5-windows;netcoreapp3.1;net48;net472</TargetFrameworks>
5+
<TargetFrameworks>net6-windows;net5-windows;netcoreapp3.1;net48;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

0 commit comments

Comments
 (0)