Merge pull request #7640 from volzhs/fix-scrollbar-2d-editor-3.0

Fix weird scrollbar appearance on 2D editor (3.0 master)

tools/editor/plugins/canvas_item_editor_plugin.h

@@ -454,8 +454,8 @@ public:
 
 };
 
-class CanvasItemEditorViewport : public VBoxContainer {
-	GDCLASS( CanvasItemEditorViewport, VBoxContainer );
+class CanvasItemEditorViewport : public Control {
+	GDCLASS( CanvasItemEditorViewport, Control );
 
 	String default_type;
 	Vector<String> types;