diff options
| author | Juan Linietsky | 2015-04-18 14:45:29 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-04-18 14:45:29 -0300 |
| commit | bedb4f1ab2bb9a41ea046b258f70d15f310fb114 (patch) | |
| tree | 6f812920a90cf79311e059987c7e4bf139d43a5e /tools/editor/plugins/rich_text_editor_plugin.h | |
| parent | e388d551b72edc2b88a864760418d0c4b86f2916 (diff) | |
| parent | 5cb4ba24d392b1a58b029b3ca315100b1c1d8a0a (diff) | |
| download | godot-bedb4f1ab2bb9a41ea046b258f70d15f310fb114.tar.gz godot-bedb4f1ab2bb9a41ea046b258f70d15f310fb114.tar.zst godot-bedb4f1ab2bb9a41ea046b258f70d15f310fb114.zip | |
Merge pull request #1662 from TheHX/fix_plugins
Fix toolbar menu position(RichText and MultiMesh plugins)
Diffstat (limited to 'tools/editor/plugins/rich_text_editor_plugin.h')
| -rw-r--r-- | tools/editor/plugins/rich_text_editor_plugin.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/editor/plugins/rich_text_editor_plugin.h b/tools/editor/plugins/rich_text_editor_plugin.h index 891951869..653d756d8 100644 --- a/tools/editor/plugins/rich_text_editor_plugin.h +++ b/tools/editor/plugins/rich_text_editor_plugin.h @@ -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); |