Fix PropertyField build errors

neon-age · Jul 9, 2021 · c4b6b72 · c4b6b72
1 parent 4bfad0f
commit c4b6b72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/Runtime/Fluent UITK/Extensions/PropertyFieldExtension.cs b/Runtime/Fluent UITK/Extensions/PropertyFieldExtension.cs
@@ -6,9 +6,10 @@ namespace AV.UITK
 {
     public static class PropertyFieldExtension
     {
+        /*
         public static SerializedProperty Property(this PropertyField field)
         {
             return null;
-        }
+        }*/
     }
 }
diff --git a/Runtime/Fluent UITK/FluentElement.Bindings.cs b/Runtime/Fluent UITK/FluentElement.Bindings.cs
@@ -37,48 +37,41 @@ public FluentElement<T> Bind(SerializedProperty property)
         {
             Bind(property.propertyPath); return x;
         }
-        #else
-        public FluentElement<T> Bind(object property) => x;
-        #endif
-
-        #if UNITY_EDITOR
         public FluentElement<T> Bind(SerializedObject serializedObject) { x.Bind(serializedObject); return x; }
         #else
-        public FluentElement<T> Bind(object serializedObject) => x;
+        public FluentElement<T> Bind(object nothing) => x;
         #endif
 
         #if UNITY_EDITOR
         public void Unbind() => x.Unbind();
         #endif
 
-
+        #if UNITY_EDITOR
         public FluentElement<PropertyField> NewField(SerializedProperty property, string label = null)
         {
-            #if UNITY_EDITOR
             return new PropertyField(property) { label = label };
-            #else
-            return null;
-            #endif
         }
+        #else
+        public FluentElement<T> NewField(object property, string label = null) => x;
+        #endif
 
+        #if UNITY_EDITOR
         public FluentElement<PropertyField> NewField(string bindingPath, string label = null)
         {
-            #if UNITY_EDITOR
             return new PropertyField { bindingPath = bindingPath, label = label };
-            #else
-            return null;
-            #endif
         }
+        #else
+        public FluentElement<T> NewField(string bindingPath, string label = null) => x;
+        #endif
 
+        #if UNITY_EDITOR
         public FluentElement<PropertyField> NewField<TSource>(Expression<Func<TSource, object>> member, string label = null)
         {
-            #if UNITY_EDITOR
             var bindingPath = FluentUITK.GetMemberPath(member);
-
             return new PropertyField { bindingPath = bindingPath, label = label };
-            #else
-            return null;
-            #endif
         }
+        #else
+        public FluentElement<T> NewField<TSource>(Expression<Func<TSource, object>> member, string label = null) => x;
+        #endif
     }
 }
diff --git a/Runtime/Fluent UITK/FluentUITK.Styles.cs b/Runtime/Fluent UITK/FluentUITK.Styles.cs
@@ -30,13 +30,6 @@ public enum Styles
 
     public static partial class FluentUITK
     {
-        static MethodInfo setToolbarStyleSheet = 
-            #if UNITY_EDITOR
-            typeof(Toolbar).GetMethod("SetToolbarStyleSheet", BindingFlags.NonPublic | BindingFlags.Static);
-            #else
-            null;
-            #endif
-
         /// <summary> Setup pre-defined styles to VisualElement. </summary>
         public static void DefineStyle(VisualElement x, Styles styles)
         {