diff options
| -rw-r--r-- | scene/2d/tile_map.cpp | 9 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 7 | ||||
| -rw-r--r-- | tools/editor/editor_help.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/project_export.cpp | 9 |
4 files changed, 25 insertions, 2 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 34a67c088f..1f16b36466 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -504,6 +504,7 @@ void TileMap::_update_dirty_quadrants() { } dirty_quadrant_list.remove( dirty_quadrant_list.first() ); + quadrant_order_dirty=true; } @@ -524,6 +525,14 @@ void TileMap::_update_dirty_quadrants() { quadrant_order_dirty=false; } + for(int i=0;i<get_child_count();i++) { + + CanvasItem *c=get_child(i)->cast_to<CanvasItem>(); + + if (c) + VS::get_singleton()->canvas_item_raise(c->get_canvas_item()); + } + _recompute_rect_cache(); } diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 0fc8e39fef..3948de7689 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -1630,6 +1630,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { clear=(!k.mod.command || k.mod.shift || k.mod.alt ); break; case KEY_DELETE: + if (!k.mod.shift) { + accept_event(); + clear=true; dobreak=true; + } else if (k.mod.command || k.mod.alt) { + dobreak=true; + } + break; case KEY_BACKSPACE: accept_event(); clear=true; dobreak=true; diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp index 238b2d1cb8..7a8805a5a1 100644 --- a/tools/editor/editor_help.cpp +++ b/tools/editor/editor_help.cpp @@ -92,7 +92,7 @@ void EditorHelpSearch::_update_search() { DocData *doc=EditorHelp::get_doc_data(); String term = search_box->get_text(); - if (term.length()<3) + if (term.length()<2) return; TreeItem *root = search_options->create_item(); diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index b5e7715d93..df8ebad08d 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -467,6 +467,14 @@ void ProjectExportDialog::_export_action(const String& p_file) { location=nl; } + /* Checked if the export location is outside the project directory, + * now will check if a file name has been entered */ + if (p_file.ends_with("/")) { + + error->set_text("Please enter a file name!"); + error->popup_centered_minsize(); + return; + } TreeItem *selected = platforms->get_selected(); if (!selected) @@ -1908,4 +1916,3 @@ ProjectExport::ProjectExport(EditorData* p_data) { } - |