From a2b3bc90a7a080fdcf7522fd452369214b0069b5 Mon Sep 17 00:00:00 2001
From: naninunenoy <naninuneno0411@gmail.com>
Date: Wed, 16 Dec 2020 23:12:10 +0900
Subject: [PATCH] fix to remve text fileld in old unity

---
 .../CustomCreate/Editor/AsmdefCustomCreateView.cs        | 9 ++++-----
 .../CustomCreate/Editor/AsmdefCustomCreateView.uxml      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
index 9c963af..c35fea4 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
@@ -40,7 +40,6 @@ namespace AsmdefHelper.CustomCreate.Editor {
             var NoEngineReferencesToggle = root.Q<Toggle>(className: "NoEngineReferencesToggle");
             var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
             var RootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
-
             var IsEditorToggle = root.Q<Toggle>(className: "IsEditorToggle");
             var CreateButton = root.Q<Button>(className: "CreateButton");
 
@@ -56,22 +55,22 @@ namespace AsmdefHelper.CustomCreate.Editor {
 #if UNITY_2020_2_OR_NEWER
             RootNamespaceTextField.value = defaultName;
 #else
-            root.Remove(RootNamespaceTextField);
+            root.Q<Box>(className: "Box").Remove(RootNamespaceTextField);
 #endif
             // .asmdefを作成して閉じる
             CreateButton.clickable.clicked += () => {
                 var asmdefName = NameTextField.value;
                 var asmdef = new AssemblyDefinitionJson {
                     name = asmdefName,
+#if UNITY_2020_2_OR_NEWER
+                    rootNamespace = RootNamespaceTextField.value,
+#endif
                     allowUnsafeCode = AllowUnsafeToggle.value,
                     autoReferenced = AutoReferencedToggle.value,
                     overrideReferences = OverrideReferencesToggle.value,
                     noEngineReferences = NoEngineReferencesToggle.value,
                     includePlatforms = IsEditorToggle.value ? new[] { "Editor" } : new string[0]
                 };
-#if UNITY_2020_2_OR_NEWER
-                asmdef.rootNamespace = RootNamespaceTextField.value;
-#endif
                 var asmdefJson = JsonUtility.ToJson(asmdef, true);
                 var asmdefPath = $"{directory}/{asmdefName}.asmdef";
                 File.WriteAllText(asmdefPath, asmdefJson, Encoding.UTF8);
diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
index 290c110..af86e43 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
@@ -6,7 +6,7 @@
     xsi:noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd"
 >
     <engine:Label class="AsmdefInfo" text="Input your asmdef info"/>
-    <engine:Box>
+    <engine:Box class="Box">
         <engine:TextField class="PathTextField"  label="Path" text="ASMDEF_PATH_HERE"  readonly="true"/>
         <engine:TextField class="NameTextField"  label="Name" text="ASMDEF_NAME_HERE"/>
         <engine:Toggle class="AllowUnsafeToggle"  label="Allow 'unsafe' Code" value="false"/>