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

Tilemap Editor: Fix some last issues of PR-4006

Browse Source
This commit is contained in:
Franklin Sobrinho
2016-03-15 14:32:28 -03:00
parent f1c58e4b18
commit 1589157337
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -1307,6 +1307,8 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
// Add menu items // Add menu items
toolbar = memnew( HBoxContainer ); toolbar = memnew( HBoxContainer );
toolbar->set_h_size_flags(SIZE_EXPAND_FILL);
toolbar->set_alignment(BoxContainer::ALIGN_END);
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(toolbar); CanvasItemEditor::get_singleton()->add_control_to_menu_panel(toolbar);
options = memnew( MenuButton ); options = memnew( MenuButton );
@@ -1320,9 +1322,8 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
p->add_separator(); p->add_separator();
p->add_item("Pick Tile", OPTION_PICK_TILE, KEY_CONTROL); p->add_item("Pick Tile", OPTION_PICK_TILE, KEY_CONTROL);
p->add_separator(); p->add_separator();
p->add_item("Select", OPTION_SELECT, KEY_MASK_SHIFT+KEY_B); p->add_item("Select", OPTION_SELECT, KEY_MASK_CMD+KEY_B);
p->add_item("Duplicate Selection", OPTION_DUPLICATE, KEY_MASK_CMD+KEY_D); p->add_item("Duplicate Selection", OPTION_DUPLICATE, KEY_MASK_CMD+KEY_D);
p->add_separator();
p->add_item("Erase Selection", OPTION_ERASE_SELECTION, KEY_DELETE); p->add_item("Erase Selection", OPTION_ERASE_SELECTION, KEY_DELETE);
p->connect("item_pressed", this, "_menu_option"); p->connect("item_pressed", this, "_menu_option");