From f3d20360469aa6d873238098848493fb54f37b4e Mon Sep 17 00:00:00 2001 From: volzhs Date: Wed, 25 Jan 2017 23:41:19 +0900 Subject: Fix weird scrollbar appearance on 2D editor (3.0 master) --- 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 f4f628fe28..dac8af5ae9 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.h +++ b/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 types; -- cgit v1.2.3