tidying up inspector

Author: gwaredd

Editor/Scripts/Layout/Layout.cs

@@ -1,7 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-using UnityEngine;
-
 namespace MG.MDV
 {
     public class Layout

Editor/Scripts/MarkdownEditor.cs

@@ -55,32 +55,24 @@ public override bool UseDefaultMargins()
             return false;
         }
 
-#if UNITY_2020_1_OR_NEWER
-        public override void OnInspectorGUI()
-        {
-            DrawEditor();
-        }
-
-        protected override void OnHeaderGUI()
-        {
-            // DrawEditor();
-        }
-#elif UNITY_2019_2_OR_NEWER
-        // TODO: workaround for bug in 2019.2
-        // https://forum.unity.com/threads/oninspectorgui-not-being-called-on-defaultasset-in-2019-2-0f1.724328/
         protected override void OnHeaderGUI()
         {
+#if UNITY_2019_2_OR_NEWER && !UNITY_2020_1_OR_NEWER
+            // TODO: workaround for bug in 2019.2
+            // https://forum.unity.com/threads/oninspectorgui-not-being-called-on-defaultasset-in-2019-2-0f1.724328/
             DrawEditor();
+#endif
         }
-#else
+
         public override void OnInspectorGUI()
         {
+#if !UNITY_2019_2_OR_NEWER || UNITY_2020_1_OR_NEWER
             DrawEditor();
-        }
 #endif
+        }
 
 
-        //------------------------------------------------------------------------------
+            //------------------------------------------------------------------------------
 
         private Editor mDefaultEditor;
 

Editor/Scripts/MarkdownViewer.cs

@@ -75,38 +75,39 @@ Layout ParseDocument()
 
         //------------------------------------------------------------------------------
 
-        public void Draw()
+        private void ClearBackground( float height )
         {
-            GUI.skin    = mSkin;
-            GUI.enabled = true;
+            var rectFullScreen = new Rect( 0.0f, 0.0f, Screen.width, Mathf.Max( height, Screen.height ) );
+            GUI.DrawTexture( rectFullScreen, mSkin.window.normal.background, ScaleMode.StretchToFill, false );
+        }
 
-            // clear background
 
-            var rectFullScreen = new Rect( 0.0f, 0.0f, Screen.width, Screen.height );
-            GUI.DrawTexture( rectFullScreen, GUI.skin.window.normal.background, ScaleMode.StretchToFill, false );
+        //------------------------------------------------------------------------------
 
+        public void Draw()
+        {
+            GUI.skin    = mSkin;
+            GUI.enabled = true;
 
-            // content rect
+            // useable width of inspector windows
 
-            var contentWidth = EditorGUIUtility.currentViewWidth - GUI.skin.verticalScrollbar.fixedWidth - 2.0f * Margin.x;
+            var contentWidth = EditorGUIUtility.currentViewWidth - mSkin.verticalScrollbar.fixedWidth - 2.0f * Margin.x;
 
 
             // draw content
 
             if( mRaw )
             {
-                EditorGUILayout.SelectableLabel( mText, GUI.skin.GetStyle( "raw" ) );
+                var style  = mSkin.GetStyle( "raw" );
+                var width  = contentWidth - mSkin.button.fixedHeight;
+                var height = style.CalcHeight( new GUIContent( mText ), width );
+
+                ClearBackground( height );
+                EditorGUILayout.SelectableLabel( mText, style, new GUILayoutOption[] { GUILayout.Width( width ), GUILayout.Height( height ) } );
             }
             else
             {
-                // reserve the space
-
-                #if !UNITY_2018
-                    GUILayout.Space( mLayout.Height );
-                #else
-                    GUILayout.FlexibleSpace();
-                #endif
-
+                ClearBackground( mLayout.Height );
                 DrawMarkdown( contentWidth );
             }
 
@@ -167,6 +168,7 @@ void DrawMarkdown( float width )
                     break;
 
                 case EventType.Layout:
+                    GUILayout.Space( mLayout.Height );
                     mLayout.Arrange( width );
                     break;