Merge branch 'master' of git.ejlersen.info:ejlersen/module-inspector
# Conflicts: # package.json
This commit is contained in:
commit
c6c7521f5c
1 changed files with 9 additions and 2 deletions
|
|
@ -66,15 +66,22 @@ namespace Module.Inspector.Editor
|
||||||
|
|
||||||
var position = new Rect(0, 0, 1, 1);
|
var position = new Rect(0, 0, 1, 1);
|
||||||
|
|
||||||
|
#if UNITY_2020_1_OR_NEWER && !UNITY_6000_1_OR_NEWER
|
||||||
if (Event.current.type == EventType.Repaint)
|
if (Event.current.type == EventType.Repaint)
|
||||||
{
|
{
|
||||||
position = GUILayoutUtility.GetLastRect();
|
position = GUILayoutUtility.GetLastRect();
|
||||||
position.y -= totalHeight;
|
position.y -= totalHeight;
|
||||||
|
|
||||||
#if UNITY_2020_1_OR_NEWER
|
|
||||||
position.width = EditorGUIUtility.currentViewWidth - 22.0f;
|
position.width = EditorGUIUtility.currentViewWidth - 22.0f;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if UNITY_6000_1_OR_NEWER
|
||||||
|
position = GUILayoutUtility.GetLastRect();
|
||||||
|
position.y -= totalHeight;
|
||||||
|
position.width = EditorGUIUtility.currentViewWidth - 22.0f;
|
||||||
|
#endif
|
||||||
|
|
||||||
position.y = position.yMax + EditorGUIUtility.singleLineHeight;
|
position.y = position.yMax + EditorGUIUtility.singleLineHeight;
|
||||||
position.height = EditorGUIUtility.singleLineHeight;
|
position.height = EditorGUIUtility.singleLineHeight;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue