From 1aaab30a2b021e8b559471c817946e07d514864d Mon Sep 17 00:00:00 2001
From: homer666 <homer666@users.noreply.github.com>
Date: Wed, 24 Apr 2019 04:30:03 +1000
Subject: [PATCH] Hide "Tilemap" menu properly in CanvasItem view

---
 editor/plugins/tile_map_editor_plugin.cpp | 3 +++
 editor/plugins/tile_map_editor_plugin.h   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp
index 467b83f4f80..1e2b17485fe 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 296e8619496..3bc10861f0d 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);