Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 05:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1662 from TheHX/fix_plugins

Browse source 
Fix toolbar menu position(RichText and MultiMesh plugins)
This commit is contained in:
Juan Linietsky 2015-04-18 14:45:29 -03:00
commit bedb4f1ab2
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/editor/plugins/rich_text_editor_plugin.cpp
View file

@ -28,6 +28,8 @@
/*************************************************************************/
#include "rich_text_editor_plugin.h"
#include "os/file_access.h"
#include "canvas_item_editor_plugin.h"
void RichTextEditor::_notification(int p_what) {
switch(p_what) {
@ -100,7 +102,8 @@ void RichTextEditor::edit(Node *p_rich_text) {
RichTextEditor::RichTextEditor() {
options = memnew( MenuButton );
add_child(options);
//add_child(options);
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
options->set_area_as_parent_rect();
options->set_text("RichText");
@ -129,10 +132,10 @@ bool RichTextEditorPlugin::handles(Object *p_object) const {
void RichTextEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
rich_text_editor->show();
rich_text_editor->options->show();
} else {
rich_text_editor->hide();
rich_text_editor->options->hide();
rich_text_editor->edit(NULL);
}
@ -149,10 +152,7 @@ RichTextEditorPlugin::RichTextEditorPlugin(EditorNode *p_node) {
rich_text_editor->set_margin(MARGIN_TOP,0);
rich_text_editor->set_margin(MARGIN_BOTTOM,10);
rich_text_editor->hide();
rich_text_editor->options->hide();
}