Merge pull request #7639 from volzhs/fix-scrollbar-2d-editor-2.1

Fix weird scrollbar appearance on 2D editor (2.1)

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;