Merge pull request #243 from Henry00IS/20193

Unity 2019.3 fixed vertex, face and paint tool window size.
sabresaurus · Dec 23, 2019 · 71efd3f · 71efd3f
2 parents 6b4dffd + dafcd6c
commit 71efd3f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/Scripts/Tools/PaintEditor.cs b/Scripts/Tools/PaintEditor.cs
@@ -474,14 +474,22 @@ public override void OnSceneGUI(SceneView sceneView, Event e)
             switch (drawingMode)
             {
                 case DrawingMode.Color:
+#if UNITY_2019_3_OR_NEWER
+                    toolbarHeight = 230;
+#else
                     toolbarHeight = 217;
+#endif
                     break;
 
                 case DrawingMode.R:
                 case DrawingMode.G:
                 case DrawingMode.B:
                 case DrawingMode.Alpha:
+#if UNITY_2019_3_OR_NEWER
+                    toolbarHeight = 138;
+#else
                     toolbarHeight = 126;
+#endif
                     break;
             }
 

diff --git a/Scripts/Tools/SurfaceEditor.cs b/Scripts/Tools/SurfaceEditor.cs
@@ -64,7 +64,11 @@ private enum AlignDirection
         private float unroundedDeltaAngle = 0;
 
         // Main UI rectangle for this tool's UI
+#if UNITY_2019_3_OR_NEWER
+        private readonly Rect toolbarRect = new Rect(6, 40, 215, 245);
+#else
         private readonly Rect toolbarRect = new Rect(6, 40, 200, 226);
+#endif
 
         // Used to track what polygons have been previously clicked on, so that the user can cycle click through objects
         // on the same (or similar) ray cast

diff --git a/Scripts/Tools/VertexEditor.cs b/Scripts/Tools/VertexEditor.cs
@@ -997,9 +997,13 @@ public void OnRepaint (SceneView sceneView, Event e)
 				DrawVertices(sceneView, e);
 			}
 
-			// Draw UI specific to this editor
-			Rect rectangle = new Rect(0, 50, 175, 180);
-			GUIStyle toolbar = new GUIStyle(EditorStyles.toolbar);
+            // Draw UI specific to this editor
+#if UNITY_2019_3_OR_NEWER
+            Rect rectangle = new Rect(0, 50, 185, 195);
+#else
+            Rect rectangle = new Rect(0, 50, 175, 180);
+#endif
+            GUIStyle toolbar = new GUIStyle(EditorStyles.toolbar);
 			toolbar.normal.background = SabreCSGResources.ClearTexture;
 			toolbar.fixedHeight = rectangle.height;
 			GUILayout.Window(140002, rectangle, OnToolbarGUI, "", toolbar);