summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorFranklin Sobrinho <franklin_gs@hotmail.com>2016-03-15 14:32:28 -0300
committerFranklin Sobrinho <franklin_gs@hotmail.com>2016-03-15 14:32:28 -0300
commit15891573374210323ae37293a63f53aaa6d44af5 (patch)
tree2692e6dc50a395f77501a29520b8e7630f5a38a9 /tools
parentf1c58e4b189bfde0397bd489ed7b9a25d8f8947a (diff)
Tilemap Editor: Fix some last issues of PR-4006
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/plugins/tile_map_editor_plugin.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp
index ea46458cdf..30ec6c086c 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_map_editor_plugin.cpp
@@ -1307,6 +1307,8 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
// Add menu items
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);
options = memnew( MenuButton );
@@ -1320,9 +1322,8 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
p->add_separator();
p->add_item("Pick Tile", OPTION_PICK_TILE, KEY_CONTROL);
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_separator();
p->add_item("Erase Selection", OPTION_ERASE_SELECTION, KEY_DELETE);
p->connect("item_pressed", this, "_menu_option");