diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-25 20:39:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 20:39:31 +0100 |
| commit | ae258e2679bd9deda8b311d030771fab03303833 (patch) | |
| tree | e4d04b2f2376575a5afa74cc0e6d3d6dc4b6a265 /tools/editor | |
| parent | 831d9b925af2caaff8f7723723f46e1d98ef0c14 (diff) | |
| parent | f3d20360469aa6d873238098848493fb54f37b4e (diff) | |
Merge pull request #7640 from volzhs/fix-scrollbar-2d-editor-3.0
Fix weird scrollbar appearance on 2D editor (3.0 master)
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.h | 4 |
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; |