From c6a73f01f01c40acb15a0bdc4bdf0cdfe28a57ed Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 19 Aug 2021 23:58:32 +0200 Subject: [PATCH] Node editor - Tweak grid size and apply grid size to script Type coloring - Fix object's white color --- src/Artemis.UI.Shared/Utilities/TypeUtilities.cs | 2 +- .../Editor/Controls/VisualScriptPresenter.cs | 2 +- .../Editor/Styles/VisualScriptPresenter.xaml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Artemis.UI.Shared/Utilities/TypeUtilities.cs b/src/Artemis.UI.Shared/Utilities/TypeUtilities.cs index b979006e4..314cdb989 100644 --- a/src/Artemis.UI.Shared/Utilities/TypeUtilities.cs +++ b/src/Artemis.UI.Shared/Utilities/TypeUtilities.cs @@ -23,7 +23,7 @@ namespace Artemis.UI.Shared public static (Color, Color) GetTypeColors(Type type) { if (type == typeof(object)) - return (new SKColor(0xFFFFFF).ToColor(), new SKColor(0xFFFFFF).Darken(0.35f).ToColor()); + return (SKColors.White.ToColor(), SKColors.White.Darken(0.35f).ToColor()); TypeColorRegistration? typeColorRegistration = NodeService?.GetTypeColor(type); if (typeColorRegistration != null) diff --git a/src/Artemis.VisualScripting/Editor/Controls/VisualScriptPresenter.cs b/src/Artemis.VisualScripting/Editor/Controls/VisualScriptPresenter.cs index bd47ec9ee..d7c4016c9 100644 --- a/src/Artemis.VisualScripting/Editor/Controls/VisualScriptPresenter.cs +++ b/src/Artemis.VisualScripting/Editor/Controls/VisualScriptPresenter.cs @@ -121,7 +121,7 @@ namespace Artemis.VisualScripting.Editor.Controls } public static readonly DependencyProperty GridSizeProperty = DependencyProperty.Register( - "GridSize", typeof(int), typeof(VisualScriptPresenter), new PropertyMetadata(24)); + "GridSize", typeof(int), typeof(VisualScriptPresenter), new PropertyMetadata(12)); public int GridSize { diff --git a/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml b/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml index afa908aa7..eb9341488 100644 --- a/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml +++ b/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml @@ -87,13 +87,13 @@ - + - - - - + + + +