godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix weird scrollbar appearance on 2D editor (2.1)
This commit is contained in:
Rémi Verschelde 2017-01-25 20:39:45 +01:00 committed by GitHub
parent 9038a96e49 5b2c31a18a
commit ad899a0dd9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/plugins/canvas_item_editor_plugin.h
View File

@ -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;