Skip to content

Restore .NET 10 solution build #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xincheng213618 wants to merge 1 commit into from
+5 −5
Closed

Restore .NET 10 solution build #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ST.Library.UI/NodeEditor/STNodeEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,6 @@ private void RenderEditorToCanvasLegacy(SKCanvas canvas) {
if (!string.IsNullOrEmpty(m_find.Mark)) this.OnDrawMark(m_drawing_tools);
break;
}
return bitmap;
}

if (this._ShowLocation) this.OnDrawNodeOutLocation(m_drawing_tools, this.Size, m_lst_node_out);
this.OnDrawAlert();
}
Expand Down Expand Up @@ -1181,7 +1178,7 @@ protected virtual void OnDrawMagnet(DrawingTools dt, MagnetInfo mi) {
protected virtual void OnDrawSelectedRectangle(DrawingTools dt, RectangleF rectf) {
if (m_canvas == null) return;
var fill = Color.FromArgb(this._SelectedRectangleColor.A / 3, this._SelectedRectangleColor);
Rectangle rect = this.CanvasToControl(m_rect_select);
RectangleF rect = this.CanvasToControl(m_rect_select);
using (var stroke = new SKPaint { Color = SkiaDrawingHelper.ToSKColor(this._SelectedRectangleColor), Style = SKPaintStyle.Stroke, StrokeWidth = 1, IsAntialias = true })
using (var bg = new SKPaint { Color = SkiaDrawingHelper.ToSKColor(fill), Style = SKPaintStyle.Fill, IsAntialias = true }) {
m_canvas.DrawRect(rectf.Left, rectf.Top, rectf.Width, rectf.Height, stroke);
Expand Down
1 change: 1 addition & 0 deletions ST.Library.UI/ST.Library.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<Nullable>disable</Nullable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>preview</LangVersion>
<NoWarn>$(NoWarn);WFO1000</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions WinNodeEditorDemo/WinNodeEditorDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
<NoWarn>$(NoWarn);WFO1000</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>preview</LangVersion>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion WpfNodeEdittorDemo/WpfNodeEdittorDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);WFO1000</NoWarn>
<ImplicitUsings>disable</ImplicitUsings>
<UseWPF>true</UseWPF>
<UseWindowsForms>True</UseWindowsForms>
Expand Down