From 6387872d0fa5e7d796bb2456f1cd1ce3fe776b2a Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Mon, 25 Aug 2014 10:58:36 +0100 Subject: [PATCH] Fixed GL draws overlapping scrollbars --- .../Fungus/FungusScript/Editor/FungusScriptWindow.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs index 28fc2761..f27acb7e 100755 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs @@ -62,7 +62,15 @@ namespace Fungus.Script scrollViewRect.xMax += position.width * bufferScale; scrollViewRect.yMax += position.height * bufferScale; - fungusScript.scrollPos = GUI.BeginScrollView(new Rect(0, 0, position.width, position.height), fungusScript.scrollPos, scrollViewRect); + Rect windowRect = new Rect(0, 0, position.width, position.height); + + // Clip GL drawing so not to overlap scrollbars + Rect clipRect = new Rect(fungusScript.scrollPos.x + scrollViewRect.x, + fungusScript.scrollPos.y + scrollViewRect.y, + windowRect.width - 15, + windowRect.height - 15); + + fungusScript.scrollPos = GLDraw.BeginScrollView(windowRect, fungusScript.scrollPos, scrollViewRect, clipRect); if (Event.current.type == EventType.ContextClick) { @@ -123,7 +131,7 @@ namespace Fungus.Script GLDraw.DrawBox(outlineRect, Color.green, 2); } - GUI.EndScrollView(); + GLDraw.EndScrollView(); GUILayout.BeginVertical(); GUILayout.FlexibleSpace();