godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #28347 from homer666/tilemap-hide-menu

Browse Source 
Hide "TileMap" menu properly in CanvasItem view
This commit is contained in:
Rémi Verschelde
2019-04-25 13:32:04 +02:00
committed by GitHub
parent 8b3eb59d66 1aaab30a2b
commit 5fe971145c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -1949,6 +1949,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
// Container to the right of the toolbar // Container to the right of the toolbar
toolbar_right = memnew(HBoxContainer); toolbar_right = memnew(HBoxContainer);
toolbar_right->hide();
toolbar_right->set_h_size_flags(SIZE_EXPAND_FILL); toolbar_right->set_h_size_flags(SIZE_EXPAND_FILL);
toolbar_right->set_alignment(BoxContainer::ALIGN_END); toolbar_right->set_alignment(BoxContainer::ALIGN_END);
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(toolbar_right); 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->show();
tile_map_editor->get_toolbar()->show(); tile_map_editor->get_toolbar()->show();
tile_map_editor->get_toolbar_right()->show();
} else { } else {
tile_map_editor->hide(); tile_map_editor->hide();
tile_map_editor->get_toolbar()->hide(); tile_map_editor->get_toolbar()->hide();
tile_map_editor->get_toolbar_right()->hide();
tile_map_editor->edit(NULL); tile_map_editor->edit(NULL);
} }
} }

1
editor/plugins/tile_map_editor_plugin.h
View File

@@ -214,6 +214,7 @@ protected:
public: public:
HBoxContainer *get_toolbar() const { return toolbar; } HBoxContainer *get_toolbar() const { return toolbar; }
HBoxContainer *get_toolbar_right() const { return toolbar_right; }
bool forward_gui_input(const Ref<InputEvent> &p_event); bool forward_gui_input(const Ref<InputEvent> &p_event);
void forward_canvas_draw_over_viewport(Control *p_overlay); void forward_canvas_draw_over_viewport(Control *p_overlay);