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

Fixed the "Tile Set" button being able to go out of bounds.

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias
2018-01-03 21:56:57 -02:00
parent cd63407aa4
commit fb68ceebae
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/plugins/tile_set_editor_plugin.cpp
View File

@@ -238,11 +238,8 @@ void TileSetEditor::_bind_methods() {
TileSetEditor::TileSetEditor(EditorNode *p_editor) { TileSetEditor::TileSetEditor(EditorNode *p_editor) {
Panel *panel = memnew(Panel);
panel->set_anchors_and_margins_preset(Control::PRESET_WIDE);
add_child(panel);
MenuButton *options = memnew(MenuButton); MenuButton *options = memnew(MenuButton);
panel->add_child(options); CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
options->set_position(Point2(1, 1)); options->set_position(Point2(1, 1));
options->set_text(TTR("Tile Set")); options->set_text(TTR("Tile Set"));
options->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM); options->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM);
@@ -420,8 +417,6 @@ AutotileEditor::AutotileEditor(EditorNode *p_editor) {
p.push_back((int)SHAPE_DELETE); p.push_back((int)SHAPE_DELETE);
tools[SHAPE_DELETE]->connect("pressed", this, "_on_tool_clicked", p); tools[SHAPE_DELETE]->connect("pressed", this, "_on_tool_clicked", p);
tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_DELETE]); tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_DELETE]);
//tools[SHAPE_CREATE_FROM_NOT_BITMASKED] = memnew(ToolButton);
//tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_CREATE_FROM_NOT_BITMASKED]);
tool_containers[TOOLBAR_SHAPE]->add_change_receptor(memnew(VSeparator)); tool_containers[TOOLBAR_SHAPE]->add_change_receptor(memnew(VSeparator));
tools[SHAPE_KEEP_INSIDE_TILE] = memnew(ToolButton); tools[SHAPE_KEEP_INSIDE_TILE] = memnew(ToolButton);
tools[SHAPE_KEEP_INSIDE_TILE]->set_toggle_mode(true); tools[SHAPE_KEEP_INSIDE_TILE]->set_toggle_mode(true);