Merge pull request #19 from GilpStudio/master

Added compatibility whith Unity 2020.1 - Fix: #15

Author: marijnz

Editor/ToolbarCallback.cs

@@ -15,8 +15,16 @@ public static class ToolbarCallback
 	{
 		static Type m_toolbarType = typeof(Editor).Assembly.GetType("UnityEditor.Toolbar");
 		static Type m_guiViewType = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
+#if UNITY_2020_1_OR_NEWER
+		static Type m_iWindowBackendType = typeof(Editor).Assembly.GetType("UnityEditor.IWindowBackend");
+		static PropertyInfo m_windowBackend = m_guiViewType.GetProperty("windowBackend",
+			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+		static PropertyInfo m_viewVisualTree = m_iWindowBackendType.GetProperty("visualTree",
+			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+#else
 		static PropertyInfo m_viewVisualTree = m_guiViewType.GetProperty("visualTree",
 			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+#endif
 		static FieldInfo m_imguiContainerOnGui = typeof(IMGUIContainer).GetField("m_OnGUIHandler",
 			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 		static ScriptableObject m_currentToolbar;
@@ -42,8 +50,15 @@ static void OnUpdate()
 				m_currentToolbar = toolbars.Length > 0 ? (ScriptableObject) toolbars[0] : null;
 				if (m_currentToolbar != null)
 				{
+#if UNITY_2020_1_OR_NEWER
+					var windowBackend = m_windowBackend.GetValue(m_currentToolbar);
+
+					// Get it's visual tree
+					var visualTree = (VisualElement) m_viewVisualTree.GetValue(windowBackend, null);
+#else
 					// Get it's visual tree
 					var visualTree = (VisualElement) m_viewVisualTree.GetValue(m_currentToolbar, null);
+#endif
 
 					// Get first child which 'happens' to be toolbar IMGUIContainer
 					var container = (IMGUIContainer) visualTree[0];

Editor/ToolbarExtender.cs

@@ -28,7 +28,9 @@ static ToolbarExtender()
 			FieldInfo toolIcons = toolbarType.GetField(fieldName,
 				BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
 
-#if UNITY_2019_1_OR_NEWER
+#if UNITY_2019_3_OR_NEWER
+			m_toolCount = toolIcons != null ? ((int) toolIcons.GetValue(null)) : 8;
+#elif UNITY_2019_1_OR_NEWER
 			m_toolCount = toolIcons != null ? ((int) toolIcons.GetValue(null)) : 7;
 #elif UNITY_2018_1_OR_NEWER
 			m_toolCount = toolIcons != null ? ((Array) toolIcons.GetValue(null)).Length : 6;
@@ -40,7 +42,11 @@ static ToolbarExtender()
 			ToolbarCallback.OnToolbarGUI += OnGUI;
 		}
 
+#if UNITY_2019_3_OR_NEWER
+		public const float space = 8;
+#else
 		public const float space = 10;
+#endif
 		public const float largeSpace = 20;
 		public const float buttonWidth = 32;
 		public const float dropdownWidth = 80;
@@ -68,7 +74,11 @@ static void OnGUI()
 			Rect leftRect = new Rect(0, 0, screenWidth, Screen.height);
 			leftRect.xMin += space; // Spacing left
 			leftRect.xMin += buttonWidth * m_toolCount; // Tool buttons
+#if UNITY_2019_3_OR_NEWER
+			leftRect.xMin += space; // Spacing between tools and pivot
+#else
 			leftRect.xMin += largeSpace; // Spacing between tools and pivot
+#endif
 			leftRect.xMin += 64 * 2; // Pivot buttons
 			leftRect.xMax = playButtonsPosition;
 
@@ -80,7 +90,11 @@ static void OnGUI()
 			rightRect.xMax -= dropdownWidth; // Layout
 			rightRect.xMax -= space; // Spacing between layout and layers
 			rightRect.xMax -= dropdownWidth; // Layers
+#if UNITY_2019_3_OR_NEWER
+			rightRect.xMax -= space; // Spacing between layers and account
+#else
 			rightRect.xMax -= largeSpace; // Spacing between layers and account
+#endif
 			rightRect.xMax -= dropdownWidth; // Account
 			rightRect.xMax -= space; // Spacing between account and cloud
 			rightRect.xMax -= buttonWidth; // Cloud
@@ -94,10 +108,17 @@ static void OnGUI()
 			rightRect.xMax -= space;
 
 			// Add top and bottom margins
+#if UNITY_2019_3_OR_NEWER
+			leftRect.y = 4;
+			leftRect.height = 22;
+			rightRect.y = 4;
+			rightRect.height = 22;
+#else
 			leftRect.y = 5;
 			leftRect.height = 24;
 			rightRect.y = 5;
 			rightRect.height = 24;
+#endif
 
 			if (leftRect.width > 0)
 			{