1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00

Merge pull request #1662 from TheHX/fix_plugins

Fix toolbar menu position(RichText and MultiMesh plugins)
This commit is contained in:
Juan Linietsky
2015-04-18 14:45:29 -03:00
4 changed files with 19 additions and 20 deletions

View File

@@ -42,6 +42,8 @@ class RichTextEditor : public Control {
OBJ_TYPE(RichTextEditor, Control );
friend class RichTextEditorPlugin;
enum {
PARSE_BBCODE,
@@ -49,8 +51,8 @@ class RichTextEditor : public Control {
};
Panel *panel;
MenuButton *options;
RichTextLabel *node;
MenuButton *options;
FileDialog *file_dialog;
void _file_selected(const String& p_path);