summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2017-01-25 23:41:19 +0900
committervolzhs <volzhs@gmail.com>2017-01-25 23:41:19 +0900
commitf3d20360469aa6d873238098848493fb54f37b4e (patch)
treee0bde12ee433a0398c4d83025d85bf215f05c637
parent355ce0d0de2787c9dba25d623c1a4cda314d12d5 (diff)
Fix weird scrollbar appearance on 2D editor (3.0 master)
-rw-r--r--tools/editor/plugins/canvas_item_editor_plugin.h4
1 files 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<String> types;