Merge branch 'NetStandard' of https://github.com/vchelaru/FlatRedBall …

…into NetStandard
vchelaru · Jan 16, 2024 · 35f64e8 · 35f64e8
2 parents e2f05b3 + 49e7349
commit 35f64e8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/FRBDK/Glue/Glue/Controls/CreatePluginWindow.xaml.cs b/FRBDK/Glue/Glue/Controls/CreatePluginWindow.xaml.cs
@@ -10,6 +10,7 @@
 using System.Windows.Forms;
 using L = Localization;
 using MessageBox = System.Windows.Forms.MessageBox;
+using GlueFormsCore.Extensions;
 
 namespace FlatRedBall.Glue.Controls;
 
@@ -36,6 +37,13 @@ public CreatePluginWindow()
         FillInstalledPluginComboBox();
 
         UpdateToSelectedSource();
+
+        Loaded += HandleLoaded;
+    }
+
+    private void HandleLoaded(object sender, RoutedEventArgs e)
+    {
+        this.MoveToCursor();
     }
 
     #region Methods

diff --git a/FRBDK/Glue/Glue/VSHelpers/VSSolution.cs b/FRBDK/Glue/Glue/VSHelpers/VSSolution.cs
@@ -33,7 +33,7 @@ public static bool AddExistingProjectWithDotNet(FilePath solution, FilePath proj
                 var startInfo = new ProcessStartInfo
                 {
                     FileName = "dotnet.exe",
-                    Arguments = $"sln \"{solution.FullPath}\" add \"{project.FullPath}\"",
+                    Arguments = $"sln \"{solution.FullPath}\" add \"{project.FullPath.Replace("/", "\\")}\" --in-root",
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden,
                     RedirectStandardOutput = true,

diff --git a/FRBDK/Glue/GlueCommon/SaveClasses/VariableDefinition.cs b/FRBDK/Glue/GlueCommon/SaveClasses/VariableDefinition.cs
@@ -73,6 +73,8 @@ public class VariableDefinition
         [JsonIgnore]
         public Func<IElement, NamedObjectSave, ReferencedFileSave, List<string>> CustomGetForcedOptionFunc;
 
+        // Added Jan 15 2024, default to true to match behavior 
+        public bool CanBeSetInFile = true;
 
         public bool HasGetter { get; set; } = true;
 

diff --git a/FRBDK/Glue/OfficialPlugins/PropertyGrid/MainPropertyGridPlugin.cs b/FRBDK/Glue/OfficialPlugins/PropertyGrid/MainPropertyGridPlugin.cs
@@ -244,7 +244,10 @@ private void HandleNamedObjectSelect(NamedObjectSave namedObject, GlueElement cu
                 }
                 foreach(var variable in ati.VariableDefinitions)
                 {
-                    variable.DefaultValue = null;
+                    if(variable.CanBeSetInFile == false)
+                    {
+                        variable.DefaultValue = null;
+                    }
                 }
             }