maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases 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
parent e388d551b7 5cb4ba24d3
commit bedb4f1ab2
4 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/editor/plugins/multimesh_editor_plugin.cpp
View file

@ -29,8 +29,7 @@
#include "multimesh_editor_plugin.h" #include "multimesh_editor_plugin.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "spatial_editor_plugin.h"
void MultiMeshEditor::_node_removed(Node *p_node) { void MultiMeshEditor::_node_removed(Node *p_node) {
@ -299,7 +298,7 @@ void MultiMeshEditor::_menu_option(int p_option) {
void MultiMeshEditor::edit(MultiMeshInstance *p_multimesh) { void MultiMeshEditor::edit(MultiMeshInstance *p_multimesh) {
node=p_multimesh; node=p_multimesh;
} }
@ -326,7 +325,8 @@ MultiMeshEditor::MultiMeshEditor() {
options = memnew( MenuButton ); options = memnew( MenuButton );
add_child(options); //add_child(options);
SpatialEditor::get_singleton()->add_control_to_menu_panel(options);
options->set_area_as_parent_rect(); options->set_area_as_parent_rect();
options->set_text("MultiMesh"); options->set_text("MultiMesh");
@ -341,7 +341,6 @@ MultiMeshEditor::MultiMeshEditor() {
populate_dialog->add_child(vbc); populate_dialog->add_child(vbc);
populate_dialog->set_child_rect(vbc); populate_dialog->set_child_rect(vbc);
HBoxContainer *hbc = memnew( HBoxContainer ); HBoxContainer *hbc = memnew( HBoxContainer );
surface_source = memnew( LineEdit ); surface_source = memnew( LineEdit );
@ -435,10 +434,10 @@ bool MultiMeshEditorPlugin::handles(Object *p_object) const {
void MultiMeshEditorPlugin::make_visible(bool p_visible) { void MultiMeshEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
multimesh_editor->show(); multimesh_editor->options->show();
} else { } else {
multimesh_editor->hide(); multimesh_editor->options->hide();
multimesh_editor->edit(NULL); multimesh_editor->edit(NULL);
} }
@ -457,9 +456,7 @@ MultiMeshEditorPlugin::MultiMeshEditorPlugin(EditorNode *p_node) {
multimesh_editor->set_margin(MARGIN_TOP,0); multimesh_editor->set_margin(MARGIN_TOP,0);
multimesh_editor->set_margin(MARGIN_BOTTOM,10); multimesh_editor->set_margin(MARGIN_BOTTOM,10);
multimesh_editor->options->hide();
multimesh_editor->hide();
} }

4
tools/editor/plugins/multimesh_editor_plugin.h
View file

@ -42,14 +42,14 @@ class MultiMeshEditor : public Control {
OBJ_TYPE(MultiMeshEditor, Control ); OBJ_TYPE(MultiMeshEditor, Control );
friend class MultiMeshEditorPlugin;
AcceptDialog *err_dialog; AcceptDialog *err_dialog;
MenuButton * options;
MultiMeshInstance *_last_pp_node; MultiMeshInstance *_last_pp_node;
bool browsing_source; bool browsing_source;
Panel *panel; Panel *panel;
MenuButton * options;
MultiMeshInstance *node; MultiMeshInstance *node;
LineEdit *surface_source; LineEdit *surface_source;

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

@ -28,6 +28,8 @@
/*************************************************************************/ /*************************************************************************/
#include "rich_text_editor_plugin.h" #include "rich_text_editor_plugin.h"
#include "os/file_access.h" #include "os/file_access.h"
#include "canvas_item_editor_plugin.h"
void RichTextEditor::_notification(int p_what) { void RichTextEditor::_notification(int p_what) {
switch(p_what) { switch(p_what) {
@ -100,7 +102,8 @@ void RichTextEditor::edit(Node *p_rich_text) {
RichTextEditor::RichTextEditor() { RichTextEditor::RichTextEditor() {
options = memnew( MenuButton ); 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_area_as_parent_rect();
options->set_text("RichText"); options->set_text("RichText");
@ -129,10 +132,10 @@ bool RichTextEditorPlugin::handles(Object *p_object) const {
void RichTextEditorPlugin::make_visible(bool p_visible) { void RichTextEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
rich_text_editor->show(); rich_text_editor->options->show();
} else { } else {
rich_text_editor->hide(); rich_text_editor->options->hide();
rich_text_editor->edit(NULL); 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_TOP,0);
rich_text_editor->set_margin(MARGIN_BOTTOM,10); rich_text_editor->set_margin(MARGIN_BOTTOM,10);
rich_text_editor->options->hide();
rich_text_editor->hide();
} }

4
tools/editor/plugins/rich_text_editor_plugin.h
View file

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