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

Merge pull request #15311 from YeldhamDev/tileset_button_fix_2 

Fixed "Tile Set" button always showing bug introduced with #15309
This commit is contained in:
Rémi Verschelde 2018-01-04 13:54:16 +01:00 committed by GitHub
parent 94bda27659 ca90c737b7
commit da4edf83d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -238,16 +238,16 @@ void TileSetEditor::_bind_methods() {
TileSetEditor::TileSetEditor(EditorNode *p_editor) { TileSetEditor::TileSetEditor(EditorNode *p_editor) {
MenuButton *options = memnew(MenuButton); menu = memnew(MenuButton);
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options); CanvasItemEditor::get_singleton()->add_control_to_menu_panel(menu);
options->set_position(Point2(1, 1)); menu->hide();
options->set_text(TTR("Tile Set")); menu->set_text(TTR("Tile Set"));
options->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM); menu->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM);
options->get_popup()->add_item(TTR("Remove Item"), MENU_OPTION_REMOVE_ITEM); menu->get_popup()->add_item(TTR("Remove Item"), MENU_OPTION_REMOVE_ITEM);
options->get_popup()->add_separator(); menu->get_popup()->add_separator();
options->get_popup()->add_item(TTR("Create from Scene"), MENU_OPTION_CREATE_FROM_SCENE); menu->get_popup()->add_item(TTR("Create from Scene"), MENU_OPTION_CREATE_FROM_SCENE);
options->get_popup()->add_item(TTR("Merge from Scene"), MENU_OPTION_MERGE_FROM_SCENE); menu->get_popup()->add_item(TTR("Merge from Scene"), MENU_OPTION_MERGE_FROM_SCENE);
options->get_popup()->connect("id_pressed", this, "_menu_cbk"); menu->get_popup()->connect("id_pressed", this, "_menu_cbk");
editor = p_editor; editor = p_editor;
cd = memnew(ConfirmationDialog); cd = memnew(ConfirmationDialog);
add_child(cd); add_child(cd);
@ -283,6 +283,7 @@ void TileSetEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
tileset_editor->show(); tileset_editor->show();
tileset_editor->menu->show();
autotile_button->show(); autotile_button->show();
autotile_editor->side_panel->show(); autotile_editor->side_panel->show();
if (autotile_button->is_pressed()) { if (autotile_button->is_pressed()) {
@ -290,6 +291,7 @@ void TileSetEditorPlugin::make_visible(bool p_visible) {
} }
} else { } else {
tileset_editor->hide(); tileset_editor->hide();
tileset_editor->menu->hide();
autotile_editor->side_panel->hide(); autotile_editor->side_panel->hide();
autotile_editor->hide(); autotile_editor->hide();
autotile_button->hide(); autotile_button->hide();