diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-25 13:32:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 13:32:04 +0200 |
| commit | 5fe971145c2bdebf2d68ee3cb3aeb126c7f68e46 (patch) | |
| tree | fa5bf96d675e12a8d21a5884971074bf24b8692b /editor/plugins | |
| parent | 8b3eb59d663d21adde7fabcb2cf249acb7fab1ef (diff) | |
| parent | 1aaab30a2b021e8b559471c817946e07d514864d (diff) | |
Merge pull request #28347 from homer666/tilemap-hide-menu
Hide "TileMap" menu properly in CanvasItem view
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 73576c9117..abb52f8359 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -1949,6 +1949,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) { // Container to the right of the toolbar toolbar_right = memnew(HBoxContainer); + toolbar_right->hide(); toolbar_right->set_h_size_flags(SIZE_EXPAND_FILL); toolbar_right->set_alignment(BoxContainer::ALIGN_END); CanvasItemEditor::get_singleton()->add_control_to_menu_panel(toolbar_right); @@ -2045,10 +2046,12 @@ void TileMapEditorPlugin::make_visible(bool p_visible) { tile_map_editor->show(); tile_map_editor->get_toolbar()->show(); + tile_map_editor->get_toolbar_right()->show(); } else { tile_map_editor->hide(); tile_map_editor->get_toolbar()->hide(); + tile_map_editor->get_toolbar_right()->hide(); tile_map_editor->edit(NULL); } } diff --git a/editor/plugins/tile_map_editor_plugin.h b/editor/plugins/tile_map_editor_plugin.h index 296e861949..3bc10861f0 100644 --- a/editor/plugins/tile_map_editor_plugin.h +++ b/editor/plugins/tile_map_editor_plugin.h @@ -214,6 +214,7 @@ protected: public: HBoxContainer *get_toolbar() const { return toolbar; } + HBoxContainer *get_toolbar_right() const { return toolbar_right; } bool forward_gui_input(const Ref<InputEvent> &p_event); void forward_canvas_draw_over_viewport(Control *p_overlay); |