From 5b2c31a18ade5a1c205597e467af95ae2f9ab971 Mon Sep 17 00:00:00 2001
From: volzhs <volzhs@gmail.com>
Date: Wed, 25 Jan 2017 23:34:41 +0900
Subject: [PATCH] Fix weird scrollbar appearance on 2D editor (2.1)

---
 tools/editor/plugins/canvas_item_editor_plugin.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/tools/editor/plugins/canvas_item_editor_plugin.h
index b8d75b882eb..08be9028e9a 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.h
+++ b/tools/editor/plugins/canvas_item_editor_plugin.h
@@ -447,8 +447,8 @@ public:
 
 };
 
-class CanvasItemEditorViewport : public VBoxContainer {
-	OBJ_TYPE( CanvasItemEditorViewport, VBoxContainer );
+class CanvasItemEditorViewport : public Control {
+	OBJ_TYPE( CanvasItemEditorViewport, Control );
 
 	String default_type;
 	Vector<String> types;